yashsingh1/xdaforums huggingface dataset:
[Samsung Galaxy Nexus] okanb3:
Okay, just for sure; i only downloaded android_frameworks_base and trying to cherry-pick on it.

I did the same,

git init

git remote add url

git fetch

git cherry-pick commit-id

It gave me this,

So, i did

git status

Then i opened packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java and found <<<< HEAD.

So, what now? Am i going to delete that line or what? I don't know what must i do at this point

And for info, this is the commit which i trying to cherry-pick --- https://github.com/CyanogenMod/andr...mmit/7ba230e3513ad0f47bc9b334cbdc3a0d380b8e3c
[Samsung Galaxy Nexus] MysteryEmotionz:
<<<<<<<<<HEAD is the beginning of the conflict. If you scroll down you'll find <<<<<<<<<<<<<name of cherry-pick. You need to look at the commit and make the necessary changes to resolve the conflict. The best way to do so is look at the file from the cherry pick n add just those changes to your code then debate both the lines starting with <<<<<<<≤.
[Samsung Galaxy Nexus] okanb3:
Ok, got it and resolved the conflict.

Here comes the new question;

I can't find the commit for "Volume Rocker Wake"

Am i searching wrong? How do you guys find any commit do you want to find?
[Samsung Galaxy Nexus] dreamsforgotten:
That's even tougher Lmao not all gerrit reviews are easy to navigate and find you could try looking through commits on the github to see if it points you in the right direction or contact the dev
[Samsung Galaxy Nexus] something15525:
You almost have it! Now you just need to compare the code after HEAD, but before the ===== (that's the code in your code base), and after ==== and before the <<<<then the commit id, which is where code was added during the commit, but the code base was not the same as the one you are applying it to.

Grab the code out of that area that looks relevant, make sure no imports are missing or function calls to nowhere (the usual stuff), and then git add and git commit!

Let me know if this helps :)

---------- Post added at 06:25 PM ---------- Previous post was at 06:23 PM ----------

Really? bigdickdaddy? lol
[Samsung Galaxy Nexus] madquack:
lmao bigdickdaddy, hilarious!

also when searching commits on gerrit, at the search part, top right, you can enter different attributes like owner:, project:, branch:, message:"put in quotes like this"
[Samsung Galaxy Nexus] something15525:
I'm assuming you're talking about searching in gerrit, since I'm pretty sure you can't do this with just a git log...
[Samsung Galaxy Nexus] madquack:
Yes, I meant on gerrit haha
[Samsung Galaxy Nexus] MysteryEmotionz:
Can't take life serious. Gotta have some fun. The best part it shows up in kernel version .
[Samsung Galaxy Nexus] something15525:
Dude, you are the coolest.
[Samsung Galaxy Nexus] MysteryEmotionz:
I wouldn't go that far
[Samsung Galaxy Nexus] okanb3:
I saw your solution but i can't do what you did. Apktool gave me errors

Galaxy Nexus cihazımdan Tapatalk 4 ile gönderildi
[Samsung Galaxy Nexus] IT_Blackbelt:
Its not as simple as just deleting that line most of the time, inbetween <<<<HEAD ========= is what was in the file before merge, and after ====== and the <<<<<blahblahblah merge line is what is trying to be added by the merege. You have to go through that to make the corrections and save, then do git add filename and then git commit
[Samsung Galaxy Nexus] okanb3:
Thanks everyone! I can make cherry-pick now.

But hey, i have a new question. I think i have odexed rom, i mean when i compile from source; it'll be odexed i guess. So; how can i make that to deodexed?

EDIT: I searched for "how to deodex on google" and found i need .odex files. Neither in my rom or in my phone; there are no .odex files. Is there any way to being odexed without .odex on apks?

Or am i just doedexed? Can i be? Because i didn't do anything to be deodexed. Also deodexed mods got mad on my rom.
[Samsung Galaxy Nexus] ÜBER™:
When you build its automatically deodexed. No worries.
[Samsung Galaxy Nexus] something15525:
If you select a userdebug build, that's deodexed. user builds are odexed.
[Samsung Galaxy Nexus] dreamsforgotten:
Odex is the best
[Samsung Galaxy Nexus] something15525:
Unless you wanna theme, which is why I provide both :)
[Samsung Galaxy Nexus] MysteryEmotionz:
Thats why I wrote a script for my device that re-odexs ;)
[Samsung Galaxy Nexus] something15525:
Why don't you just do user builds as well as userdebug ones?
[Samsung Galaxy Nexus] dreamsforgotten:
Script?

Does it look like this

. build/envsetup.sh

lunch

12

(Choose say 12 for you phone model user build)

makeotapackage

#End of script
[Samsung Galaxy Nexus] MysteryEmotionz:
Why not just offer a de-odexed ROM n my script so the user had the choice n I don't have to compile 2 builds. This gives the user the chance to take your de-odexed ROM n mod with themes etc n then odex when there done. The get the benefits of both ;)

I'm not doing source built ROMs ATM. I'm more focused on my kernel work. I wrote a script that I flash in twrp/cwm that will odex any ROM.
[Samsung Galaxy Nexus] something15525:
This is exactly what I was trying to say.
[Samsung Galaxy Nexus] dreamsforgotten:
Heard that, gotta give you $hit anyway.
[Samsung Galaxy Nexus] MysteryEmotionz:
Let me know when you start doing kernels I'll teach you a thing or to
[Samsung Galaxy Nexus] dreamsforgotten:
sure soon as I drop another Rom lol
[Samsung Galaxy Nexus] Anon9mouz:
Man I been trying to build this cos ROM and I think everything is golden but for some reason the kernel isn't compiling right when building the ROM so idk what's the deal. I guess I'll try to get a log but I remember last time trying to get one it kept saying waiting for device I guess BC it was boot looping idk but I'll try again. Plus sorrie it been awhile guys. family life, lil girl and chick, school and full time job I don't have time for anything but be a consumer and rock someone else's build lol. But now I'm trying to get back into and I came back to class to get learnt and refreshed so whoever has time for a one on one in hangouts lmk

anon9mouz@gmail.com
[Samsung Galaxy Nexus] daggerxXxsin:
Hi I'm very new to rom development (and to programming for that matter) and I just recently built AOKP from source :thumbup:

I was wondering what needed to be done in order to add paranoid android pie controls (or the like) to this rom. I've heard of cherry picking but I don't know where I should start looking for commits to cherry pick (or the exact process it involves) :confused:

Any help would be appreciated. I'm really excited to learn more and start developing. Thanks in advance. :D

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] dreamsforgotten:
Very limited on tutorials but you can start at dreamsforgotten.net to brush up on the basics and that should leave you with questions that are easily searchable. Don't hesitate to return here for more elaboration.
[Samsung Galaxy Nexus] daggerxXxsin:
Sort of got inspiration from this small tut:

http://xdaforums.com/showthread.php?t=2295652

This should work until I get more experience. I'm gonna start slowly and just get a feel for it first. Quick question: since I made changes to the source, what will happen once I do a repo sync?

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] jboyer0000:
Sync will fail unless you commit your changes, just make sure your manifest is pointed to the packages you edited on your github
[Samsung Galaxy Nexus] daggerxXxsin:
Oh man, I'm such a noob. You lost me at "commit your changes" :sly:

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] MBQ_:
git add -A .

git commit -am "Add the quotations when committing"

git push origin yourRepo
[Samsung Galaxy Nexus] MysteryEmotionz:
I use git commit -m 'name of commit'
[Samsung Galaxy Nexus] something15525:
Or if you just say git commit, it should launch into your preferred text editor and allow you to write your commit message, which is more ideal for me (and others who feel like writing paragraphs in their commit messages) :P
[Samsung Galaxy Nexus] MBQ_:
*new York accent*

Get outta' heeyah!

:p
[Samsung Galaxy Nexus] MysteryEmotionz:
* Boston accent *

It's wicked awesome

;)
[Samsung Galaxy Nexus] MBQ_:
Ha!

Mark Wahlberg comes to mind. :cool:

(Sorry to derail the thread)
[Samsung Galaxy Nexus] MysteryEmotionz:
Marky mark

http://images1.fanpop.com/images/photos/1400000/Marky-Mark-mark-wahlberg-1410079-314-475.jpg
[Samsung Galaxy Nexus] MBQ_:
He used to be a rapper too! Blew my mind. :)

Being 18, it was just a litttle before my time. I missed out on ALL the good music tho :(
[Samsung Galaxy Nexus] MysteryEmotionz:
Marky mark and the funky bunch.

I'm from Massachusetts
[Samsung Galaxy Nexus] MBQ_:
Hah that's awesome!!

I heard his music was freakin' cheesy. Oh well. Adds to the fun. :D
[Samsung Galaxy Nexus] MysteryEmotionz:
Don't forget his brother Donnie. He was in new kids on the block
[Samsung Galaxy Nexus] daggerxXxsin:
Thanks to for the feedback. I was able to do what I need to do but I needed more detail, so I googled and searched XDA and found this post:

http://xdaforums.com/showpost.php?p=21391143&postcount=123

From my understanding, once I do these steps - when I repo sync after I've fork-cloned the specific repo into my source tree - the package that I've changed won't be included in the repo sync. I'll have to go into their specifc directories and do "git fetch upstream". Is that assumption correct?
[Samsung Galaxy Nexus] MBQ_:
[MENTION=2928365]MysteryEmotionz[/MENTION]

Didn't even know that. Shows how young I am! Hahah

[MENTION=1436081]daggers[/MENTION]xXxsin

Glad I was (kind of) able to help! Feel free to stop by here any time. There are some truly awesome people in this community.
[Samsung Galaxy Nexus] dreamsforgotten:
You're too advanced you know he's syncing stock source with no repo of his own I believe. So what I would do is set up your repo on github, take source, create a branch link it up add commit and push. All these you'll have to research there are plenty git tutorials but tbh git is a pita!
[Samsung Galaxy Nexus] MysteryEmotionz:
[MENTION=4763201]mbq[/MENTION] I'll be 30 next year. I don't remember marky mark and the funky bunch but I herd of them. Mark walhberg was also a Calvin Klein underware model. I do remember new kids on the block tho. I was a fan as a kid :( ( no I'm not gay )

[MENTION=1436081]daggers[/MENTION] as you can see there's a couple of devs that check here regular and we all have are strengths and weaknesses. No question is to dumb.
[Samsung Galaxy Nexus] Anon9mouz:
Well I'm needing help getting a log but for some reason the rom won't let me every time I try it says waiting on device. I'm trying to figure out why my kernel didn't compile right when brunching the rom

---------- Post added at 03:52 PM ---------- Previous post was at 03:48 PM ----------

All the rom keeps doing it boot looping. And then it will get into the rom sit for a second and then loop back Into the rom. So I swapped kernels with a cm kernel since what I'm building is based off of cm and then the rom runs fine. So that's letting me guess it's kernel but I can't forsure tell if it's not anything else bc I can't get the log. It's starting to make me mad. If anyone has a HTC one that att or gsm plz lmk bc then it would be easier to help test it
[Samsung Galaxy Nexus] MysteryEmotionz:
What are you using for a kernel that causes the loop?

Since the ROM is cm based use the kernel that let's you boot. Turn on adb debugging and switch su access to apps n adb. Boot into recovery and flag the kernel that doesn't work and try to grab a log
[Samsung Galaxy Nexus] Anon9mouz:
Hey man what's up... Ok but yea let me explain this better. Ok I'm building COS for att HTC one and I have my roomservice.xml setup to pull all the stuff needed when I brunch my device. But when I flash the rom all I get is loops. And the few seconds I get inside the rom I checked and debug and I believe apps and adb is checked but I'll try again to make sure. But yea so I ended up swapping kernels with the last cm 10.1 nightly and rom booted up fine but was missing the green theme from cos and the was no att apn and a few other things that seemed a tad bit odd. So before I swapped kernels I tried getting a log but all I got was this waiting for device. Now this flagging the kernel in recovery idk how or what that is or to do it. I would just like to actually get this built. Just don't understand when it's pulling in all the needed files in to build on. Unless I'm missing and edit somewhere I should be golden
[Samsung Galaxy Nexus] MysteryEmotionz:
Can you log at boot with the cm10.1 kernel? Let's focus on this before we worry about themes and apns. Those are ROM related and can be easily added after the ROM is compiled. Im not familiar with cos tho n how there themes work but I believe it's similar to miui
[Samsung Galaxy Nexus] Anon9mouz:
So I can tell what's wrong even with a working kernel and it boots up hmm. Ok I'll try that too
[Samsung Galaxy Nexus] MysteryEmotionz:
No all that's going to tell me is if you can log while booting.
[Samsung Galaxy Nexus] daggerxXxsin:
[MENTION=4244313]MBQ_[/MENTION]

Yeah, I'm starting to get the feeling that I'll be asking a lot (hopefully, not for long) noob questions. Looking forward to all you guy's help going forward.

Man, I have so many questions about git and how it works (especially in the context of Android) I don't even know where to start. I guess I better start focusing back on studying java and add git on the side.

Edit:

I'm actually using AOKP source, repo synced directly from their github. But it is true that I don't have a repo of that source on github, just a local copy on my HDD.

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] something15525:
This thread is how I got started, and now I've got 52 repositories I maintain for a custom AOSP ROM. Ask away :) we're all ears here!
[Samsung Galaxy Nexus] dreamsforgotten:
Mystery you really don't remember Markey Mark? I sure do, only got 1-2 years on you I'm 31 on labor day.
[Samsung Galaxy Nexus] MysteryEmotionz:
I knew of him but not his music or anything. Happy early birthday. Goggle now will probably remind me lol
[Samsung Galaxy Nexus] madquack:
If I'm using 4.3_r2.1 to build AOSP what's the easiest way to get 4.3_r2.2?

If I do:

repo init -u https://android.googlesource.com/platform/manifest -b android-4.3_r2.2

will it redownload everything when I repo sync or will it only download the changes/new branch?

Another ?, has it even been pushed to AOSP yet? I'd assume so if the changelog is already up, right?

http://funkyandroid.com/aosp-JSS15J-JSS15Q.html
[Samsung Galaxy Nexus] something15525:
Yes and yes

---------- Post added at 12:23 AM ---------- Previous post was at 12:22 AM ----------

Don't know about the changelog. I think it fixes the bitcoin vulnerability and multi touch issues with the new N7
[Samsung Galaxy Nexus] Anon9mouz:
Ok so with the cm kernel and with cos kernel they both didn't run a log. I tried to put it to app and adb on cos kernel that was looping but every reboot it would revert back to just apps. Then with cm kernel I picked apps and adb but it still wouldn't get a log so I reboot to see if the changes stuck and it did but still wouldn't get a log. So idk what to do but one of my dude thought cm repo was incomplete idk but I edited my roomservice.xml in local manifest to pull the kernel repo from slimroms so we will see if that works but if it doesnt then idk
[Samsung Galaxy Nexus] MysteryEmotionz:
See now it tells me something else is going on. You should have been able to pull a log on that kernel. Since you can't pull a log on either kernel I would check to make sure you got the correct drivers installed. My phone lgog needs mako drivers when I'm running aosp. On stock I use lg drivers.
[Samsung Galaxy Nexus] Anon9mouz:
Hmm see idk if different drivers are needed for aosp. Maybe I should try a cm rom itself to see if I can pull a log
[Samsung Galaxy Nexus] MysteryEmotionz:
That's a start
[Samsung Galaxy Nexus] daggerxXxsin:
Just ran into another hiccup. I am trying to add CM DSPManager into my build. So I added it into core.mk, compiled it and this is the error I get:

target Java: DSPManager (/home/sin/data/rom_source/aokp/out/target/common/obj/APPS/DSPManager_intermediates/classes)
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
target Java: DefaultContainerService (/home/sin/data/rom_source/aokp/out/target/common/obj/APPS/DefaultContainerService_intermediates/classes)
target Java: DownloadProvider (/home/sin/data/rom_source/aokp/out/target/common/obj/APPS/DownloadProvider_intermediates/classes)
packages/apps/DSPManager/src/com/bel/android/dspmanager/service/HeadsetService.java:193: cannot find symbol
symbol : variable HEADSET_CONNECT_PLAYER
location: class android.provider.Settings.System
Settings.System.HEADSET_CONNECT_PLAYER, 0) != 0;
^
Note: packages/apps/DSPManager/src/com/bel/android/dspmanager/service/HeadsetService.java uses or overrides a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
1 error
make: *** [/home/sin/data/rom_source/aokp/out/target/common/obj/APPS/DSPManager_intermediates/classes-full-debug.jar] Error 41
make: *** Waiting for unfinished jobs....

Not sure where I should look for the missing java class and I'm also not sure if it is really added on to my build. I mean, I see that it's trying to build the app but not sure if I added it correctly so it would be included in the otapackage.
[Samsung Galaxy Nexus] something15525:
Take a look here:

https://github.com/CyanogenMod/andr...10.2/core/java/android/provider/Settings.java

Look at line 2958. I'll see if I can find the commit it was added in.

---------- Post added at 06:29 AM ---------- Previous post was at 06:25 AM ----------

Here it is:

https://github.com/CyanogenMod/andr...mmit/6c823415149320d7f767b5bbf2022f33e06ffb33
[Samsung Galaxy Nexus] daggerxXxsin:
Ok I see. So i need to merge this into my existing frameworks base. This'll have to wait coz I'm not in front of a computer right now but I'm curious how did you know where to find what was missing?

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] something15525:
The actual error is here:

symbol : variable HEADSET_CONNECT_PLAYER
location: class android.provider.Settings.System
Settings.System.HEADSET_CONNECT_PLAYER, 0) != 0;

So I dug around a bit in frameworks/base for the file, looked for the HEADSET_CONNECT_PLAYER variable, and then dug through the commit history until I found the commit that added the code. :)
[Samsung Galaxy Nexus] daggerxXxsin:
Now that I've looked at it android.provider.System was actually trying to point me to the location, android/provider/System.java. Next time I get an error like it, I know what to try first. Didn't think it'd be that simple. XD

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] something15525:
Exactly! Just takes a bit of digging around :)
[Samsung Galaxy Nexus] something15525:
I know IT_Blackbelt posted about this a while ago, but I'm trying to integrate Torch and am getting this error:

E/AndroidRuntime( 4009): FATAL EXCEPTION: Timer-0^M
E/AndroidRuntime( 4009): java.lang.RuntimeException: Can't open flash device^M
E/AndroidRuntime( 4009): at net.cactii.flash2.FlashDevice.setFlashMode(FlashDevice.java:211)^M
E/AndroidRuntime( 4009): at net.cactii.flash2.TorchService$2.run(TorchService.java:59)^M
E/AndroidRuntime( 4009): at java.util.Timer$TimerImpl.run(Timer.java:284)^M
E/AndroidRuntime( 4009): Caused by: java.io.FileNotFoundException: /sys/class/leds/flashlight/brightness: open failed: ENOENT (No such file or directory)^M
E/AndroidRuntime( 4009): at libcore.io.IoBridge.open(IoBridge.java:409)^M
E/AndroidRuntime( 4009): at java.io.FileOutputStream.<init>(FileOutputStream.java:88)^M
E/AndroidRuntime( 4009): at java.io.FileOutputStream.<init>(FileOutputStream.java:73)^M
E/AndroidRuntime( 4009): at java.io.FileWriter.<init>(FileWriter.java:80)^M
E/AndroidRuntime( 4009): at net.cactii.flash2.FlashDevice.setFlashMode(FlashDevice.java:199)^M
E/AndroidRuntime( 4009): ... 2 more^M
E/AndroidRuntime( 4009): Caused by: libcore.io.ErrnoException: open failed: ENOENT (No such file or directory)^M
E/AndroidRuntime( 4009): at libcore.io.Posix.open(Native Method)^M
E/AndroidRuntime( 4009): at libcore.io.BlockGuardOs.open(BlockGuardOs.java:110)^M
E/AndroidRuntime( 4009): at libcore.io.IoBridge.open(IoBridge.java:393)^M
E/AndroidRuntime( 4009): ... 6 more^M

I saw he fixed it with a commit in the tuna directory, but unfortunately I'm trying this out with mako first, so that doesn't really help...were there other commits?
[Samsung Galaxy Nexus] dreamsforgotten:
java.io.FileNotFoundException: /sys/class/leds/flashlight/brightness: open failed: ENOENT (No such file or directory)
[Samsung Galaxy Nexus] something15525:
Yes, I see that. I just can't seem to find where this file should exist in source...
[Samsung Galaxy Nexus] Anon9mouz:
Ok it's kinda on the path u were saying so I'm assuming I need to do this for linux too but I did it for Windows first. Ima have to search to see how for linux but anyways I had to update sdk but I guess it need to do rsa key in order to get logs on aosp bc I didn't have that problem with sense I guess aosp. So now I guess we will see if I can get a log now
[Samsung Galaxy Nexus] MysteryEmotionz:
Working on getting a log is what I would work on first. No sense of Dev work without a log. Have you tried getting a log in windows or on a Mac?
[Samsung Galaxy Nexus] Anon9mouz:
U know what not to sound like a blonde but I don't remember what os I updated sdk lol but normally I use windows but lately I been using ubuntu and just uploading to online since there's no mtp transfer #lameforubuntu
[Samsung Galaxy Nexus] Anon9mouz:
ok this might work. i have to flash the working one then dirty flash the one that doesnt work ant it allowed me to get a log while its looping.

so here u go lmk whats up

http://pastebin.com/MryxV373 log 1

http://pastebin.com/R8hUA7Py log 2

http://pastebin.com/JLYpNvQS log 3
[Samsung Galaxy Nexus] something15525:
Yes, I see that. I just can't seem to find where this file should exist in source...

Hate to double post, but I think this question got lost in the fray here. Someone on the CM dev channels told me this was a kernel issue?

The only big difference I see between my kernel and the CM kernel is module building isn't enabled. Should I enable this? Is this even the problem?

A little help would really be appreciated :)
[Samsung Galaxy Nexus] dreamsforgotten:
Just a fya, dreamsforgotten.net will be going down permanently in a few months, I'm sure that won't inconvenience too many ppl lol.
[Samsung Galaxy Nexus] something15525:
Why man? That site helped me get started! :( it will be missed.
[Samsung Galaxy Nexus] dreamsforgotten:
Hosting cost, I'm not really making up for it so I must cut it.
[Samsung Galaxy Nexus] Pirateghost:
You need hosting? I can help out there

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] Anon9mouz:
Yes plz help I can't see that go sniff sniff
[Samsung Galaxy Nexus] dreamsforgotten:
Awesome, I haven't updated the site in forever not do I plan on it anytime, I would, however, like it to stay online as a archive for people to reference tho ... Thanks!
[Samsung Galaxy Nexus] MBQ_:
Willing to help as well, or maybe be a back up of some sort since you offered first :)
[Samsung Galaxy Nexus] Pirateghost:
I will shoot you a pm later to hash out the info. I have a shared hosting plan going to waste right now. I can get you access to it for you to upload your site.

Sent from my Galaxy Nexus
[Samsung Galaxy Nexus] dreamsforgotten:
Sounds good
[Samsung Galaxy Nexus] silver03wrx:
Your a good man pg
[Samsung Galaxy Nexus] Pirateghost:
info sent. we are working out the details. ;)

lets keep this project alive. i can even do website design work if you like (in due time).
[Samsung Galaxy Nexus] dreamsforgotten:
This was my first website ever, ccs is horrible! I def can't add web design to my list of material to learn!
[Samsung Galaxy Nexus] Pirateghost:
No worries. I will help you redesign it after I finish up a couple of other projects.

Sent from my Galaxy Nexus