121114 Commits

Author SHA1 Message Date
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
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
Michael Wright
4a8e5a05bb Merge "Generate locale-aware gamepad fallbacks for webview" 2013-12-10 22:07:00 +00:00
Michael Jurka
48e8f01390 Merge "Fix wallpaper cropping bugs" 2013-12-10 22:06:32 +00:00
Yorke Lee
89b366fa95 Reword the "Quick contacts not available" string
Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
2013-12-10 09:51:40 -08:00
Joe Fernandez
1290d8e64f am c13b4e25: am 507e635d: am 5f698449: am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1
* commit 'c13b4e25310034cc1e8da359edf1ee24d7429e9d':
  docs: Adding Android Build Tools Release Notes 19.0.1
2013-12-10 16:45:34 +00:00
Joe Fernandez
c13b4e2531 am 507e635d: am 5f698449: am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1
* commit '507e635d950a6ca17ebe417b51bfc4ad987cf06b':
  docs: Adding Android Build Tools Release Notes 19.0.1
2013-12-10 16:39:27 +00:00
Scott Main
c9cd738e10 am e26fe49d: am 113b40cc: am a09588d7: am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev
* commit 'e26fe49de16ec148c02460865c26fca50cc8974c':
  NDK release notes for r9c for review
2013-12-10 16:38:09 +00:00
Joe Fernandez
507e635d95 am 5f698449: am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1
* commit '5f69844919e0bc58aa3303865066f85ef79fd136':
  docs: Adding Android Build Tools Release Notes 19.0.1
2013-12-10 16:36:18 +00:00
Scott Main
e26fe49de1 am 113b40cc: am a09588d7: am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev
* commit '113b40cc9dee3559f14facf4f9ad056be578ca08':
  NDK release notes for r9c for review
2013-12-10 16:35:32 +00:00
Joe Fernandez
5f69844919 am 3270172f: am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1
* commit '3270172fcabd8d280daa55eb5ba50439b1c88b20':
  docs: Adding Android Build Tools Release Notes 19.0.1
2013-12-10 08:33:18 -08:00
Scott Main
113b40cc9d am a09588d7: am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev
* commit 'a09588d7d6ac2149fe6f17f3da43f2cb8ae51540':
  NDK release notes for r9c for review
2013-12-10 16:32:27 +00:00
Scott Main
a09588d7d6 am 99d663aa: Merge "NDK release notes for r9c for review" into klp-ub-dev
* commit '99d663aafa09496bcce1aa46ed928ee01532d0d6':
  NDK release notes for r9c for review
2013-12-10 08:29:29 -08:00
Joe Fernandez
3270172fca am 7618a960: docs: Adding Android Build Tools Release Notes 19.0.1
* commit '7618a960ab96c282b9905c038a96e2137011ba44':
  docs: Adding Android Build Tools Release Notes 19.0.1
2013-12-10 16:27:54 +00:00
Scott Main
99d663aafa Merge "NDK release notes for r9c for review" into klp-ub-dev 2013-12-10 16:27:10 +00:00
Narayan Kamath
93f50a1a18 am 98f50502: am 57b94b34: am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."
* commit '98f50502ea9ed4bd32f2732dc9ded146fafd2005':
  Fix inconsistency in LoggingPrintStream.
2013-12-10 10:01:32 +00:00
Narayan Kamath
98f50502ea am 57b94b34: am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."
* commit '57b94b34240aee641c0c2a415d79dbc27cf819af':
  Fix inconsistency in LoggingPrintStream.
2013-12-10 09:58:14 +00:00
Narayan Kamath
57b94b3424 am ca9ba160: am bea98dc2: Merge "Fix inconsistency in LoggingPrintStream."
* commit 'ca9ba160ae8d0b00919298845aceba8b9dc514d0':
  Fix inconsistency in LoggingPrintStream.
2013-12-10 09:53:00 +00:00