yashsingh1/xdaforums huggingface dataset:
[Galaxy S I9000 General] kasper_h:
This is why you should NEVER change things in the master branch. Every time you want to play around in the repo, first creaste & checkout a local testing branch. If you mess things up, you can always go back to the unhampered master branch. Offf course, you should then keep track of the branches you created and the work you do in them.

20 cherry picks in one branch? I usually pick a maximum of 4-5 cherries for one project (e.g. /frameworks/base). I usually don't get conflicts, but if you don't know how to deal with conflicts, I would suggest first learning some basic android-coding things so you can solve conflicts.

If you create 7 branches for 7 picks, these are not all used in building. Only the checkout'ed branch will be used during building. So you only get one cherry pick in your build.

Before you can remove a branch (git branch -D abc - use a capital D if you didn't merge it contents in the master branch) you first have to checkout to a different branch: you cannot delete the branch which is currently active (type ">git branch" to get an overview of all local branches, with a * showing which one is active).

>>git config --global core.editor "nano" can be used to set the default git editor if no editor pops up. In stead of nano, you can also use other editors (emacs, gedit) depending on your personal preference. Advantage of nano is that you don't leave the terminal editor. But I use gedit myself, as it is easier/quicker to work with.
[Galaxy S I9000 General] nrg:
git wants you to fix your branch before you do anything else. cherry picking is like merging, so if you would like to cleanup your branch you need to reset it (or run cherry pick --abort). I use git reset --merge like specified here:

http://git.661346.n2.nabble.com/Aborting-cherry-pick-td6030969.html

Its an interesting read.

PS 338 minutes? Im running my build's full clean in 70 minutes. Did you install and enable ccache?

correction: Elapsed: 44 min(s) 15 sec(s)

---------- Post added at 10:49 AM ---------- Previous post was at 10:37 AM ----------

Kasper is correct about git and using branches when you want to experiment. But its not that bad when you mess up your master branch inside android/system. You can easily delete one of the directories as long as you keep away from .repo directory. afaik repo will clone the bare repo's located in .repo so it does not refetch them from github.
[Galaxy S I9000 General] kasper_h:
Building time depends on whether you use a full ubuntu, or an ubuntu virtual machine. I build in 45 minutes as well in a regular ubuntu, but I needed 250 minutes when I was running ubuntu in an VM

Yes, you can always go back to the original state, even in the master branch. It just takes more time to restore the master branch than just deleting a branch which has gone wild :) That's why I always work in local branches.
[Galaxy S I9000 General] nrg:
My previous vm Ubuntu did it in 30 minutes. But that's not on my desktop ;)
[Galaxy S I9000 General] timothywer:
hello, I flashed aokp milestone 4 today and I like it but the battery is dead in just one day.

has anyone else experienced this, or doe sanyone have a solution?

thanks
[Galaxy S I9000 General] sthomas38:
What are you doing here?
[Galaxy S I9000 General] timpuri_noi:
yes... just donate your phone
[Galaxy S I9000 General] tishfire:
Hmm my build on 2nd attempt stopped half way, so it's broken. i think something went wrong, picked 7 items, each pick in 1 branch. some in same folder as settings has more popular item.

I'm starting to get confuse. Are you saying for 1 pick eg in framework/base. I should create 2 branch for the same cherry-pick item? 1 will be master branch abc > check out abc > fetch then create another local branch for the same cherry-pick item as local/testing eg : abc-test > checkout abc-test > fetch the same item again. In that way when the test messed up, I can remove abc-test and abc is still there?

No, 1 branch to 1 folder, some folder eg : setting has more items, so if there is 5 item in setting folder, 1 branch in that setting folder for all the items picked.

But if there is only 1 branch, there is no way to switch to another branch unless i create an empty branch.

I preder gedit too. like you said, i find it easy to use. :)

Kasper: Thanks again for the advise here, reapply appreciate.

Thanks for the link, I'll read it up.

Yeah, clean build 338 minutes, i did set up ccache, probably I did wrong somewhere or I missed something from the guide I followed. I might need to recheck. I thought it was normal for an old processor dual core 1.66ghz with 3g ram, ubuntu 11.10 64bit.

For the first attempt, i did not keep track of which folder I had created my branch in, coz there was so many of them, think at least 10? Are branches tied to folder? eg: all my branches are not in ~/android/system/ but they are instead in other sub folder of ~/android/system/ At android/system/ i did a git branch and no branches shows up. I assume branch are tied inside individual folders. Since there was so many of them, I thought I should delete android/system/ where I set up everything.

Thanks nrg for the advise too.
[Galaxy S I9000 General] kasper_h:
No we didn't understand each other I guess.

The repo consists of many different project. E.g. /frameworks/base is one project. And /packages/apps/Settings is one project. I normally have one local testing branch per project. So, I first go to /frameworks/base and make a local testing branch there. Then I download the commits for /frameworks/base I want to test. Then I would go to /packages/apps/Settings, make another local testing branch there and then download the commit for this branch.

The /android/system folder is not a git project, so you cannot see or create branches when you are in the /android/system folder. You first have to move to a certain project before you can create/check branches. So, to create an overview of all the branches you created, you have to write it down (as far as I know there is no easy way to see all branches within the whole repo - but to check the contents of a specific branch in a specific project I use qgit).

And yes, branches are tied to folder: if you download a commit for the /packages/apps/Settings project when you are in the frameworks/base folder, you will end up with conflicts (and end up with errors during building).
[Galaxy S I9000 General] DanielSanchez:
Bump. This is pretty interesting.
[Galaxy S I9000 General] kasper_h:
Any cm10 kangers here?

Verstuurd van mijn GT-I9000
[Galaxy S I9000 General] DanielSanchez:
i would like to learn after i finish with my exams... my last exam is on 27 august... so yeah. see you then ^^.
[Galaxy S I9000 General] jose.celestino:
Forever for <= 0
[Galaxy S I9000 General] beekay201:
If we want 0 to be an option (or variable, don't really how you guys call it, sorry) for bl_timeout, we would need to state it here or what? I've been exploring the code for like 1hr, i'm at the edge of my very limited programming and non-existant skills.

static void bl_set_timeout() {
if (bl_timeout > 0) {
mod_timer(&bl_timer, jiffies + msecs_to_jiffies(bl_timeout));
}
}

decimal values are allowed?

edit: nvm, ofc they're, default is 1.6

edit2: anything below 1 will result in leds being lit forever.

edit3: echo 1000 > /sys/class/misc/notification/bl_timeout will give a 1s time out (value needs to be given in msecs), otherwise it will cause issues with touchkey bl

more info: echo 1 > /sys/class/misc/notification/bl_timeout makes my touchkey bl go wild (i press back, menu lits, and vice versa, never both like normal)
[Galaxy S I9000 General] jose.celestino:
It shouldn't be a float but millisecs in a int. So anything < 1 it's being rounded to 0.

And it's not that simple, you're setting the time when the led will be turned *off*
[Galaxy S I9000 General] beekay201:
i don't even understand fully how hard it is. ;)

so, it would require telling kernel that when it receives a 0 from userspace, it should execute bl_off?
[Galaxy S I9000 General] Zatta:
How long would a first "repo sync -j16" take the first time on a 500 KiB/s connection and how big will the resulting repo become?

Taptalked u see
[Galaxy S I9000 General] beekay201:
i think it pulls around 7gb, on hdd it will take 15gb of space. for me, on a 1MiB/s connection, first time takes around 1hr, 1h30m.
[Galaxy S I9000 General] beekay201:
lost 20% overnight (went to bed @5am, woke up @3pm) with data call umts only+k9mail autosync every 3hrs, forgot to reconfigure quiet hours, when i woke had led notif on (had received email/sms around 12pm).

for the first cycle, not bad at all :D
[Galaxy S I9000 General] Jens1969:
Tested UMTS only the last two nights: lost approximately 3%/h.

With nothing changed, and one TI batch job, that's good. I'll check HSDPA next night.
[Galaxy S I9000 General] Ugene:
Hi,

I'am also trying to get a view into the android development and started to build cm7 from source. I was able to build the kernel and the source, but I was missing the modules (*.ko). Are they necessary for the build process?

Finally a dev-releated thread :)
[Galaxy S I9000 General] beekay201:
yes; well not really for the build process, but for your phone to be fully usable.

as i'm still learning (and didn't want to spend so much time in kernel at first), here's how i do it.

export ANDROID_BUILD_TOP=/home/bk201/Workspace/android/system

export ANDROID_TOOLCHAIN=/home/bk201/Workspace/android/system/prebuilt/linux-x86/toolchain/arm-eabi-4.4.3/bin

cd ~/Workspace/android/system

git clone git://github.com/teamhacksung/samsung-kernel-aries.git

cd samsung-kernel-aries/

[manage your branches, pull commits, etc etc]

./build.sh galaxysmtd

if you view build.sh, you'll see that it copies necessary files over to necessary folders.. ;) then you just need to run cm build process, it will insert your kernel/modules into the update.zip. let us know if you need more help/tips, and feel free to share your experience, that goes without saying i guess.

I1d564f90 (thank Danesh)

without:

with patchset 2 (if my memory serves me right):

with patchset 4:

i like patchset 2 better. patchset 4 feels like it's too crowded - maybe pulling "add contact" and "backspace" into the same frame of the "call" button? and giving it the same size than the space where dialled number appears?
[Galaxy S I9000 General] beekay201:
guys, to enable bootchart, can we just...

1- export INIT_BOOTCHART=true

2- re-build kernel/push to device

3- adb shell 'echo $TIMEOUT > /data/bootchart-start'

4- adb shell 'echo 120 > /data/bootchart-start'

4- source /home/bk201/Workspace/android/system/system/core/init/grab-bootchart.sh

found README.BOOTCHART, but i'm just looking for confirmation aka "go for it"

thanks :cool:
[Galaxy S I9000 General] Jens1969:
Phone rebooted/got stuck

Hi. I just wanted to report back that my phone rebooted (once) and got stuck (also once) while surfing with 'UMTS only'. Don't know, if it's related. My phone usually does not reboot or get stuck, so I wanted to report back. I'll keep an eye on the nightly thread. Should occur there also, if it's related to the latest patch (for which I'm really thankful nonetheless - thumbs up for Pawit :)).

Next night my phone will "drain" on HSDPA. Curious to see, what tomorrow brings.
[Galaxy S I9000 General] Zatta:
Yeah, count me in, just flashed my first KANG!

Okay, it takes some time, first sync -j16 took 3 attempts, the first one about 12 hours, second one less, third one maybe two. To be sure also did a 'repo sync' afterwards, just took about 10 minutes or so.

Finally I ended up with a repo of 4.8 gig.

So, continued and started building at 1900, finished 4.15 hours later, flashed perfectly over nightly 170, proud of my notebook, 1.6 Ghz, 1 Gb RAM, 32 bit, HDD with a 37 Gb partition for ubuntu 11.10 (the rest is for windows xp, dualboot).

Oh, after building the repo got almost doubled in size, now it is 8.4 gig.

Next step, how to continue, someone could recommend some sites with more info about picking/pulling/git etc?

Taptalked u see
[Galaxy S I9000 General] jose.celestino:
The official Git Tutorial is good: http://schacon.github.com/git/gittutorial.html

Also http://help.github.com/git-cheat-sheets/ or http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html

When you go to the gerrit page for a commit you can see there's a Download section with the git needed to get the code.

The Project on top tells you where inside the repo you can find the code.

For instance http://review.cyanogenmod.com/#change,9830

Project is "CyanogenMod/android_packages_apps_ADWLauncher" and I can find it inside the repo in what comes after "CyanogenMod/android", that is in "packages/apps/ADWLauncher":

[x:~/lab/Android/repo]$ cd packages/apps/ADWLauncher

[x:~/lab/Android/repo/packages/apps/ADWLauncher]$

If I wanted to grab that commit to try it out I would cherry-pick it: Download section, select cherry-pick and copy the git command then run it inside the directory:

[x:~/lab/Android/repo/packages/apps/ADWLauncher]$ git fetch http://review.cyanogenmod.com/p/CyanogenMod/android_packages_apps_ADWLauncher refs/changes/30/9830/1 && git cherry-pick FETCH_HEAD

...

* branch refs/changes/30/9830/1 -> FETCH_HEAD

[detached HEAD 1d8da9a] ADW launcher: faster screen looping

....

1 files changed, 140 insertions(+), 76 deletions(-)

After that, recompile.

If I wanted to revert this cherry-pick I would do a git reset --hard HEAD~1

or if I cherry-picked plenty of stuff, then the easiest to do is to rebase the code: do a git log and find a commit before the first cherry-pick and copy it's commit id, then do git rebase -i $COMMIT_ID, remove any lines with the commits you don't want to pick and save.

If git seems overwhelming at first is because it is :) There's plenty of ways to do the work but you end up getting the hang of it.
[Galaxy S I9000 General] beekay201:
just a few more tips.

After switching to project folder, you might want to start using branches. Branches are an easy way to manage your commits/merges/cherry-picks etc. Think of branches like clones of the local main tree (branch).

'git branch' on /packages/apps/ADWLauncher/ gives you a list of the branches you currently have, relating to ADWLauncher.

Create another branch now with 'git branch branch_name', based of the branch you're currently checking out. (no_branch) is m/gingerbread (remote master, gingerbread branch).

Then, switch to the branch you just created with 'git checkout branch_name'.

Then cherry-pick the commit like jose says below. It will fetch it into the branch you're in.

Advantage in doing this? Any commit you cherry-pick doesn't mess with master, making it simpler to track stuff, rebasing, merging local branches, etc. i think that if you cherry-pick on master, it will tell you that you're on detached head mode, if you want to pull another commit on the same project you'll need to create another branch to retain the first commit.

you can also check history of said branch with 'git log'.

welcome aboard, Zatta.

another subject: anybody uses Lense lockscreen nowadays? got stuck on lockscreen, had to power button 10s. i'm at work right now :|

also, can anyone confirm if the bootchart steps are correct?
[Galaxy S I9000 General] Kaik541:
Or you can just repo sync from the main folder and it will discard cherry picked commits.
[Galaxy S I9000 General] beekay201:
I might be doing something wrong, but repo sync only discards commits unless you have them on local branches, in which case it simply checks out to master.

edit: i was doing something wrong though, i was tracking m/gingerbread, when i should be tracking github/gingerbread. if i track the latter, even if i'm checking out a different branch, it will only repo sync upstream, but all the commits stay untouched, and it won't check out of the current branch.

now, when i checkout to a local branch:

git is great :)

edit2: anyone feeling some slowdown in market 3.1.5 with I52fcd648 in? when i tried the first time, i thought it was slower (starting up, searching, scrolling, not downloading), golauncher would start to lag a bit in transition effects, settings too. so now i'm testing without it, and market definately is faster. opens up faster, scrolling is smoother.. someone experienced the same? i have to say that i factory reseted between these two builds (internal sd and ext as well, can't even remember the last time i did that).
[Galaxy S I9000 General] Zatta:
managed to cherry-pick these:

Idf1cb09f and

I89bdbc11, disable bootanimation.

More to practice this whole thing, first repo synched, 10 minutes, then cherry-picked those two commits with jose.celestino's discription and build the kang, took less than half an hour.

Anyway, my bootanimation is disabled, don't know about bootup speed, it is fast anyway :)

We'll see tomorrow, it's in the changelog already.
[Galaxy S I9000 General] beekay201:
rebuilt with it in, now it seems it's as fast as without it. built with same stuff, except Id97f8fe8 and disable boot anim commits (want to test Idb544452). i'm thinking it has to do with something else. it's too strange.

edit: also without this I5cb28b08 1/2, 2/2

edit2: Id36319ea nice addition Danesh, i didn't even know we had swype down gesture in keyboard. :)

edit3: Idb544452 works flawlessly, confirmed, conflicts with disable bootanim (Idf1cb09f, I89bdbc11)
[Galaxy S I9000 General] Jens1969:
Note on battery

Just a note: last night my phone drained 3,8%/h with HSDPA + HSUPA enabled. That is almost exactly as with UMTS only.

Since I was on 2G for months, I didn't notice any improvements (if there were any) with battery and UMTS/HSDPA/HSUPA. My phone used to drain about 10% per hour before I switched to 2G. I'll let keep an eye on it for some more nights.

When I woke up my phone today, screen froze and it rebooted automatically. I might need to go back to JVT just to have a fresh start with CM again. Again Wifi was disabled.
[Galaxy S I9000 General] beekay201:
automatic reboots don't allow for logcat checking, but you can check /proc/last_kmsg.
[Galaxy S I9000 General] Kaik541:
whenever I use the "cherry-pick" option on gerrit, when I use "repo sync" from my working directory I get this:

shawn@fatman:~/cyanogenmod$ repo sync
Fetching projects: 100% (326/326), done.
Syncing work tree: 100% (326/326), done.

bionic/: discarding 1 commits
development/: discarding 1 commits
device/samsung/aries-common/: discarding 1 commits
frameworks/base/: discarding 3 commits
packages/apps/CMParts/: discarding 1 commits
packages/apps/Contacts/: discarding 1 commits
shawn@fatman:~/cyanogenmod$
[Galaxy S I9000 General] beekay201:
Are you tracking github/gingerbread? Checkout to one of your branches and

git branch --set-upstream github/gingerbread.

If you're already doing it like this, then idk.
[Galaxy S I9000 General] Kaik541:
why are you bothering to track upstream? you can just repo sync to keep everything in line and makes testing commits a bit more difficult (as you have to git reset to get back to the same state in every branch)
[Galaxy S I9000 General] beekay201:
i don't know if i understood you correctly.

i do use repo sync; what i'm saying is that if you make a branch track upstream (github/gingerbread), either when creating the branch or setting upstream after creating the branch, when you repo sync, it only updates master of every project (thus keeping everything in line), but doesn't leave user created branches, which it does if the branch is tracking m/gingerbread.

then you just have to recheck the branches you already have and rebase if needed, automatically or interactively (allowing for commits to be retained instead of discarded).

also, when you switch branches, git even tells you by how many commits the current branch is ahead or behind upstream, and that doesn't happen if the branch is tracking m/gingerbread.

i think there are a lot of ways to keep stuff organized.
[Galaxy S I9000 General] beekay201:
Hey, can someone try to reproduce?

I was just quoting a post in tapaltak, but it's a big post yeah, so i just pressed the backspace just long enough to erase almost the whole thing (the timeout set to 15s) and lockscreen activated.

Will try this on other apps too.

#52
[Galaxy S I9000 General] beekay201:
If064d762 :D thanks pawitp

I202314aa :D thanks Danesh

@Kaik, look here mate:

this is tracking upstream.
[Galaxy S I9000 General] Kaik541:
I understand the concept, I'm not confused by it, I'm saying why are you creating your own branches to begin with unless you are making/submitting fixes?
[Galaxy S I9000 General] beekay201:
Because there are fixes or features that i want to keep, either because they have not been merged yet, or because they have been abandoned.. Makes my life easier if i keep everything in branches; cherry picking the same commits every time i build... that would be at least troublesome.

Even if I don't submit stuff, I could just do it out of curiosity no?
[Galaxy S I9000 General] beekay201:
tried with xda app and mms.apk, couldn't reproduce it.

#52
[Galaxy S I9000 General] Jens1969:
It did not happen to me. Tested two posts in two different threads.

[Anyone going to test it: jump to the OP - that one is long enough. ;-)]
[Galaxy S I9000 General] beekay201:
just tested again with tapatalk 1.12.4 :| happened again (quoting cm nightlies OP); just noticed there's a new version of tapatalk, will try updating to see if it solves it.

yep, just updated to 1.12.7, doesn't happen anymore.
[Galaxy S I9000 General] beekay201:
testing:

I412f9bba Backport radial gradients speed-up

Ie7cb5cd9 Mark subsets of opaque bitmaps as opaque

I7834d5ca ConnectivityService: update network settings when RAT changes

I0deb709a VideoCamera: Return from onResume sooner to reduce the application launch time

Id36319ea Keyboard : Swipe Gestures
[Galaxy S I9000 General] beekay201:
Last night build: all good until now, middle unlock ring works and looks nice too.

Edit: i'm having some trouble getting miui like battery status bar to compile. Thinking of rebasing without that option that hides battery status in status bar.
[Galaxy S I9000 General] kar200:
Hi guys,

Anyone willing to share a Kang with the rest of us?

K.
[Galaxy S I9000 General] Jens1969:
Hi.

It's not, that I would not do in general. But a kang should come from one of the acknowledged forum members. So a lot of people (me included) build kangs but do not share them for this reason. Also I don't want to be the one who is blamed, when things go south with some phones.
[Galaxy S I9000 General] beekay201:
Like Jens said, we will not release personal kangs.

The purpose of this thread is to discuss kang building, where kangers support other kangers.

I'm willing to post a cheat list towards src building, even though there's plenty of info around, maybe this weekend i'll get around to do it.
[Galaxy S I9000 General] Zatta:
Hey bk, maybe you could include this branching thing, I am still picking cherries every time one by one. Thanks!

Taptalked u see
[Galaxy S I9000 General] kar200:
No worries. I did build CM7 before but unfortunately at the moment I don't have a big quota for the internet left (In Australia once you go over your quota your internet speed is capped back to dialup speeds).

I think the whole source is about 4GB+? I will wait for the buildbot to come back to life next week and flash again the merged sources. I was more after a "nightly" than a "Kang".

I am happy to read some howto's about building a Kang. So I am still following this thread.

K.
[Galaxy S I9000 General] beekay201:
Sure, i was already thinking of it as well :)

@kar200, full repo goes to 7gb or more.
[Galaxy S I9000 General] wogfella:
@kar200 - OT

Try TPG unlimited.
[Galaxy S I9000 General] beekay201:
We should try to keep on topic, can you use pms next time? I realize that this is on general forum but still...

Thanks.

sent from a kanged gt-i9000 using Tapatalk
[Galaxy S I9000 General] cba1986:
{DELETED}..
[Galaxy S I9000 General] jose.celestino:
This thread is about KANGS, if you're on a nightly ask on the CM7 SGS nightlies thread.