Nick Kralevich
411954aef0
am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
...
* commit 'a64163093e6e55f8bbb0153e783fb0ab635e9e60':
Don't try to set service.bootanim.exit
2013-12-11 22:08:05 +00:00
Baligh Uddin
851138fcee
am dd914cc2: (-s ours) am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'dd914cc253afcccd0513df90f22013d8ad01a18a':
Import translations. DO NOT MERGE
2013-12-11 22:08:00 +00:00
Baligh Uddin
a9024556c4
am ac7737fc: (-s ours) am 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ac7737fc99561344c19a267f7e8d1fe5e27d32a0':
Import translations. DO NOT MERGE
2013-12-11 22:07:55 +00:00
Marco Nelissen
4f6a139493
am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
...
* commit 'c680bab3315de2f6af14c1e9fcd3aaf63fa15848':
Parse UUID string with Long.parseLong
2013-12-11 22:02:36 +00:00
Narayan Kamath
d775ed03ed
am 78168595: am 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."
...
* commit '78168595070f04aaa0d788b90009b1402c354775':
Add libutils dependency for libandroidfw host build.
2013-12-11 22:02:31 +00:00
Narayan Kamath
0bc3607c28
am 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
...
* commit '9f09408e3939c5afdb3f9dafc41afd249303ed7f':
Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 22:02:25 +00:00
Elliott Hughes
e2fbb2ac68
am d3dd83c6: am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"
...
* commit 'd3dd83c67a216f91654aa7d007c92eb82f567528':
fix possible buffer overrun and memory leak
2013-12-11 22:02:20 +00:00
Scott Main
5f41b262a5
am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
...
* commit 'aec930b2c6c7e9ad2a7808a1636f7c0fae0164af':
rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 22:02:15 +00:00
Nick Kralevich
a64163093e
am 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
...
* commit '1e137549fea552377b53c642518af0201e85cafe':
Don't try to set service.bootanim.exit
2013-12-11 22:00:56 +00:00
Baligh Uddin
dd914cc253
am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '5d819bef3f4bf97c87032cc403e859b1d0d6797a':
Import translations. DO NOT MERGE
2013-12-11 22:00:51 +00:00
Baligh Uddin
ac7737fc99
am 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit '6a8b169118e4c3df80a800f28f32ad9ec61260ce':
Import translations. DO NOT MERGE
2013-12-11 22:00:47 +00:00
Nick Kralevich
1e137549fe
am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
...
* commit 'efa5c88f37165d02e3e11882026c7660c879ff61':
Don't try to set service.bootanim.exit
2013-12-11 13:53:29 -08:00
Baligh Uddin
5d819bef3f
am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '32aa82223a5e0e5475df81378d0e6715601b2cc2':
Import translations. DO NOT MERGE
2013-12-11 13:52:06 -08:00
Baligh Uddin
6a8b169118
am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e30461c07676496e9f848c6ea35e70583cec5949':
Import translations. DO NOT MERGE
2013-12-11 13:52:01 -08:00
Baligh Uddin
32aa82223a
am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0a102150448747bcedcd3276740e1adb8130ae03':
Import translations. DO NOT MERGE
2013-12-11 13:46:35 -08:00
Baligh Uddin
e30461c076
am 60835d4b: (-s ours) Import translations. DO NOT MERGE
...
* commit '60835d4be46caff5d5b62ffb19031b580d42b504':
Import translations. DO NOT MERGE
2013-12-11 13:46:31 -08:00
Nick Kralevich
efa5c88f37
Merge "Don't try to set service.bootanim.exit"
2013-12-11 21:46:08 +00:00
Baligh Uddin
0a10215044
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-12-11 21:32:53 +00:00
Igor Murashkin
f51021c32c
Merge "CameraMetadata: updated generated code (with markdown support)"
2013-12-11 21:20:44 +00:00
Alan Viverette
39de9bfa7f
Verify drawables added to ViewOverlay so they can be scheduled
...
Change-Id: I73d0633966f84876e2093c874acd6813efdbc370
2013-12-11 13:15:47 -08:00
Nick Kralevich
e58d09a552
Don't try to set service.bootanim.exit
...
init has never allowed the bootanimation code to
set service.bootanim.exit, and has always generated the
dmesg error message
<3>[ 17.644615] init: sys_prop: permission denied uid:1003 name:service.bootanim.exit
Since setting this property has no effect and never worked, delete
the code which tries to do it.
Change-Id: Idacc5467d85479a8cf974702af8895011be585ea
2013-12-11 13:10:55 -08:00
Marco Nelissen
c680bab331
am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
...
* commit '69b4670730ec557af6dc67f6c42aff20e5b0b86a':
Parse UUID string with Long.parseLong
2013-12-11 21:02:37 +00:00
Narayan Kamath
7816859507
am 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."
...
* commit '007f3cf55980e3615bf7fb4fcabde279dde02853':
Add libutils dependency for libandroidfw host build.
2013-12-11 21:02:27 +00:00
Narayan Kamath
9f09408e39
am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
...
* commit '336bf2fb497fece49a874da2ca2e11572446d1d1':
Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 21:02:08 +00:00
Elliott Hughes
d3dd83c67a
am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"
...
* commit '5b9437df99b0351d7e94a61c9f599d9031f24c08':
fix possible buffer overrun and memory leak
2013-12-11 21:02:00 +00:00
Scott Main
aec930b2c6
am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
...
* commit 'f70d7b9aced31b978b63c4cfb2a5efee31436ba8':
rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 21:01:55 +00:00
Baligh Uddin
9ad3907169
Import translations. DO NOT MERGE
...
Change-Id: I3065b51a4d5b72fc2dbd65f34f2b7dec89fb37d7
Auto-generated-cl: translation import
2013-12-11 12:55:02 -08:00
Baligh Uddin
60835d4be4
Import translations. DO NOT MERGE
...
Change-Id: Ifd2fd893861b827395080d8bfde873be9c0e7425
Auto-generated-cl: translation import
2013-12-11 12:46:13 -08:00
Narayan Kamath
5a74e2df57
Reimplement ZipFileRO in terms of libziparchive.
...
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).
This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.
One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).
bug: 10193060
(cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df)
Change-Id: I86a2c528575d4a3ca86b94be068dcdc3c17c2ed6
2013-12-11 19:06:18 +00:00
Marco Nelissen
69b4670730
am ce3bd309: Merge "Parse UUID string with Long.parseLong"
...
* commit 'ce3bd309b12e9552c05d5a59a06d7883618c5ca0':
Parse UUID string with Long.parseLong
2013-12-11 10:14:56 -08:00
William Luh
3554740951
Merge "Expose new API for querying whether a certificate was user added."
2013-12-11 18:09:45 +00:00
Marco Nelissen
ce3bd309b1
Merge "Parse UUID string with Long.parseLong"
2013-12-11 18:07:50 +00:00
Narayan Kamath
007f3cf559
am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."
...
* commit 'bb349cdb09d67118842fb86a0f4a8b66b5a32985':
Add libutils dependency for libandroidfw host build.
2013-12-11 10:07:35 -08:00
Narayan Kamath
bb349cdb09
Merge "Add libutils dependency for libandroidfw host build."
2013-12-11 17:36:20 +00:00
Narayan Kamath
070274ec0c
Add libutils dependency for libandroidfw host build.
...
Change-Id: I7fe0bb466f0b1cdbfef8934da2231ad20f05b648
2013-12-11 16:48:07 +00:00
George Mount
ed62560f69
Merge "Add Path trimming."
2013-12-11 15:08:59 +00:00
Narayan Kamath
336bf2fb49
am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."
...
* commit 'd21752dff45c7d8856e63026cfddc303a302df14':
Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 03:45:58 -08:00
Narayan Kamath
d21752dff4
Merge "Reimplement ZipFileRO in terms of libziparchive."
2013-12-11 11:41:10 +00:00
Igor Murashkin
ace5bf0412
CameraMetadata: updated generated code (with markdown support)
...
- also updates description of android.blackLevel.lock
Change-Id: I2d10c492bd6779bbb51672da9854252ba18d4327
2013-12-10 17:36:40 -08:00
Elliott Hughes
5b9437df99
am 4a72b306: Merge "fix possible buffer overrun and memory leak"
...
* commit '4a72b3064cecc85c56b8d75bb4a2d9fedbf76ec8':
fix possible buffer overrun and memory leak
2013-12-10 17:35:25 -08:00
Elliott Hughes
4a72b3064c
Merge "fix possible buffer overrun and memory leak"
2013-12-11 01:29:28 +00:00
Jim Miller
94f71949f7
Merge "Fix memory leak caused by mismatched linkToDeath() in WindowManagerService"
2013-12-11 01:24:35 +00:00
Scott Main
f70d7b9ace
am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
...
* commit 'cf5ed42f0b5f2b3787da39d19e9716d6b244b9b5':
rewrite intent guide and add doc with intents supported by platform apps
2013-12-10 17:04:57 -08:00
Scott Main
cf5ed42f0b
am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps
...
* commit 'df75bdcc5546112958a6a5834c1a7e060f88bc68':
rewrite intent guide and add doc with intents supported by platform apps
2013-12-11 01:00:46 +00:00
Jim Miller
7267ed1b4b
Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
...
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().
It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.
The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.
Fixes bug 11982048
Change-Id: I6959816b819ba953512c53675162195cbf1e0653
2013-12-10 16:48:13 -08:00
Scott Main
df75bdcc55
rewrite intent guide and add doc with intents supported by platform apps
...
Change-Id: Ida7ccbc693e7635198fd368b9560b7843266c7cc
2013-12-10 15:53:37 -08:00
Brian Harris
544604098c
Fix incorrect name in eglSwapBuffers log wrapper
...
Correctly identify eglSwapBuffers in EGLLogWrapper, which had been
labeled as "eglInitialize".
Change-Id: I67c61e100e2f84400ceebc28712f036e5a055017
2013-12-10 15:36:46 -08:00
John Reck
7d2edfc073
Merge "Unbreak display list debug dumping"
2013-12-10 23:33:21 +00:00
John Reck
6304919732
Unbreak display list debug dumping
...
Change-Id: I1c6a79f047b29fa60907f6e128cb843a45b88bff
2013-12-10 15:22:01 -08:00
Craig Mautner
dab959d498
Put new Activity at frontOfTask
...
If all previous activities are finishing then a newly added activity
should be marked frontOfTask. Not doing so will cause the wrong
activity to be brought up next.
Fixes bug 12054192.
Fixes bug 11575233.
Change-Id: I663a4da62aa55359c2e970276a6c7cade557634f
2013-12-10 14:47:57 -08:00