Deepanshu Gupta
10d620ff2c
Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev
2015-03-02 19:37:04 +00:00
Deepanshu Gupta
07d453fa09
Merge "Add status bar time for 5.1" into lmp-mr1-dev
2015-03-02 19:26:15 +00:00
Joe Fernandez
ad87503ed0
am 98a57a1a: am 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
...
* commit '98a57a1ab8da73f6b328082f31c6c6732108cf2b':
docs: March 2015 Dashboard update
2015-03-02 18:26:56 +00:00
Joe Fernandez
98a57a1ab8
am 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
...
* commit '4725bec1ff03d8be859c52dba6ac663016c2295c':
docs: March 2015 Dashboard update
2015-03-02 18:18:46 +00:00
Joe Fernandez
4725bec1ff
am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
...
* commit '8243b74f7f19d57455f7ff9188f539d0361139db':
docs: March 2015 Dashboard update
2015-03-02 18:10:54 +00:00
Joe Fernandez
8243b74f7f
am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
...
* commit '6a0c808487392f6cd8d62ad4abb51c0f077ace0f':
docs: March 2015 Dashboard update
2015-03-02 18:04:39 +00:00
Joe Fernandez
6a0c808487
am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update
...
* commit '9b94a5399845efc9d52ebf37e8fde320885c07c8':
docs: March 2015 Dashboard update
2015-03-02 17:14:51 +00:00
Joe Fernandez
9b94a53998
am 97a1173b: docs: March 2015 Dashboard update
...
* commit '97a1173b63be900ab5aed694e8022c60f3817fa0':
docs: March 2015 Dashboard update
2015-03-02 17:09:01 +00:00
Joe Fernandez
97a1173b63
docs: March 2015 Dashboard update
...
Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361
2015-03-02 09:00:55 -08:00
Geoff Mendal
e80017ab44
am e4679922: (-s ours) am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'e467992236a40646d31a9171ecaac51b0d90fd9a':
Import translations. DO NOT MERGE
2015-03-02 14:30:00 +00:00
Geoff Mendal
fdbfd3c995
am b77346ad: (-s ours) am 6b5b052e: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b77346add048f7aa776ecf55400a711598fc8aa9':
Import translations. DO NOT MERGE
2015-03-02 14:24:49 +00:00
Geoff Mendal
e467992236
am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'fe78077418982794dc4b8966e3d389ce0f7ad13c':
Import translations. DO NOT MERGE
2015-03-02 14:22:52 +00:00
Geoff Mendal
fe78077418
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2015-03-02 14:18:15 +00:00
Geoff Mendal
b77346add0
am 6b5b052e: (-s ours) Import translations. DO NOT MERGE
...
* commit '6b5b052ee6b75cee712215284923d2fcd17a7871':
Import translations. DO NOT MERGE
2015-03-02 14:16:57 +00:00
Geoff Mendal
341b04711d
Import translations. DO NOT MERGE
...
Change-Id: Icff770a9eb701279c5011e816970c69c58862174
Auto-generated-cl: translation import
2015-03-02 06:15:22 -08:00
Geoff Mendal
6b5b052ee6
Import translations. DO NOT MERGE
...
Change-Id: I7b517cbc545481e58ddc8afc769fc5f39d4fd1ad
Auto-generated-cl: translation import
2015-03-02 06:09:28 -08:00
Geoff Mendal
7b43f3a2cb
am 3f27483f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
...
* commit '3f27483fc0d85ed91806029b491183428c1a5c01':
Import translations. DO NOT MERGE
2015-03-02 14:00:22 +00:00
Geoff Mendal
c9faf353d5
am 4d065f9d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
...
* commit '4d065f9d6298afce4f1bb8687c6f9f5720507057':
Import translations. DO NOT MERGE
2015-03-02 14:00:10 +00:00
Geoff Mendal
3f27483fc0
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
2015-03-02 13:52:28 +00:00
Geoff Mendal
4d065f9d62
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
2015-03-02 13:52:07 +00:00
Geoff Mendal
f9175d5de1
am c92894e6: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c92894e61a9ccbb226ff67ea86b7b4c469d6188a':
Import translations. DO NOT MERGE
2015-03-02 13:50:55 +00:00
Geoff Mendal
be9706dfb5
Import translations. DO NOT MERGE
...
Change-Id: Ifd7882b235b226a5840595667429569125f1849f
Auto-generated-cl: translation import
2015-03-02 07:48:34 -06:00
Geoff Mendal
20f4004368
Import translations. DO NOT MERGE
...
Change-Id: I276c74627637383b8e9e132dcb41b597e7db1d54
Auto-generated-cl: translation import
2015-03-02 05:48:19 -08:00
Geoff Mendal
c92894e61a
Import translations. DO NOT MERGE
...
Change-Id: I90f0e65ebcc2b70c492f9c1f726436f47c582a5d
Auto-generated-cl: translation import
2015-03-02 05:42:09 -08:00
Bryce Lee
82ae149f5b
Allow press and hold from non-interactive.
...
Bug: 19520133
Change-Id: I3ad50f72499667e9b711057f381144a6c3ae6138
2015-02-27 17:59:16 -08:00
Nick Vaccaro
f257469c08
Avoid unhandled page fault cases on Android Wear
...
Telephony routines were dereferencing the null result of
getITelephony() and getSubscriberInfo(), causing unhandled page
faults at the hardware level.
Bug: 18264818
Change-Id: I7d058aa881c7dac20051d6faea2a6d52be4bd74e
2015-02-27 15:31:09 -08:00
Rich Slogar
7dc5dd4aef
am ac8da5a2: am 7aa654bc: am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit 'ac8da5a223f9732ba5dcf45896e0c390f009bc28':
docs: gradle plugin version update
2015-02-27 23:24:27 +00:00
Rich Slogar
ac8da5a223
am 7aa654bc: am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '7aa654bc19699ea6eb7bed74c9dd503e91efb6a1':
docs: gradle plugin version update
2015-02-27 23:18:32 +00:00
Rich Slogar
7aa654bc19
am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '37f207e118f1de7442a8874f7ebc6db643d0edcc':
docs: gradle plugin version update
2015-02-27 23:10:27 +00:00
Rich Slogar
b9157aff78
docs: sdk tools 24.1 update
...
Change-Id: I995c1012c22b8b6fa45c4cfd33f90b8b82ddb0eb
2015-02-27 14:53:42 -08:00
Rich Slogar
37f207e118
am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '191131d4494f0b6c51463ae9e771672bad5c970a':
docs: gradle plugin version update
2015-02-27 22:50:34 +00:00
Rich Slogar
191131d449
am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit '50e8b020f69687f11a0abce4ec5312697f9a1449':
docs: gradle plugin version update
2015-02-27 22:43:42 +00:00
Rich Slogar
50e8b020f6
am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs
...
* commit 'a83f64451d55882366491e66c7479f194e0625ea':
docs: gradle plugin version update
2015-02-27 22:37:17 +00:00
Rich Slogar
a83f64451d
Merge "docs: gradle plugin version update" into lmp-docs
2015-02-27 22:31:33 +00:00
Rich Slogar
5fcfe207fe
docs: gradle plugin version update
...
b.android 153270
Change-Id: I0c752fdf28181c50924a1ca946b5110f773659dc
2015-02-27 14:29:24 -08:00
Stephen Smalley
e9dc17233f
SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
...
The current SELinuxPolicyInstallReceiver logic can yield a partial
or mixed (old and new) set of policy files under /data/security/current
if there is an error or a crash at certain points before completing
the installation of the update.
Rewrite the logic to avoid the possibility of such partial or mixed
policy updates by using rename on the entire directory of policy
files rather than operating on a per-file basis. Also separate
the extraction of the policy files from the bundle into their own
temporary directory. Make sure we delete any previous temporary directory
or backup directory before using them for this update. Drop the
use of a symlink for /data/security/current altogether; it provides
no benefit.
Change-Id: I564af01c2c3ca1531c216013b8724c7511f32de8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov >
2015-02-27 16:07:55 -05:00
Mark Salyzyn
bbef7cf3bb
am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"
...
* commit '012c3b723a8e73012444b7f839b363f698725a01':
jni: Add paranoia regarding android_logger_list_read
2015-02-27 19:03:13 +00:00
Mark Salyzyn
012c3b723a
am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"
...
* commit 'a891d08dad829c9aacd29bd2c3b36debe3fc1cc3':
jni: Add paranoia regarding android_logger_list_read
2015-02-27 18:52:36 +00:00
Mark Salyzyn
a891d08dad
Merge "jni: Add paranoia regarding android_logger_list_read"
2015-02-27 18:46:04 +00:00
Luan Nguyen
d85224b6bd
am 25395a7e: am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit '25395a7e07caca454bb411492698ea8ce1aaaaa9':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:16:49 +00:00
Ryosuke Matsuuchi
c9c0de9e79
am 6876209a: am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit '6876209ae84ee55d4803f8c32032a89735e76c1f':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:16:44 +00:00
Andrew Solovay
be76cc2f68
am 35b15f39: am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '35b15f399b9c0140544384115215e08f16659cbb':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:16:38 +00:00
Luan Nguyen
25395a7e07
am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit '4490d6b5706bd839896b3760954a08cb4dc0575d':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:10:34 +00:00
Ryosuke Matsuuchi
6876209ae8
am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'a667bcd688a35f7c9184452ffe7eb4bfe2989bf2':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:10:31 +00:00
Andrew Solovay
35b15f399b
am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit 'f8ceaa6b557f59fdd654ce63e35f9b73c0be33b8':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:10:27 +00:00
Luan Nguyen
4490d6b570
am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'dedba01ac8b85d535171a910aa6b72ea9ce4498c':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 17:00:18 +00:00
Ryosuke Matsuuchi
a667bcd688
am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'd4cdf18e1c763c2aaedbb4f0cab3657db2adc097':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 17:00:13 +00:00
Andrew Solovay
f8ceaa6b55
am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
...
* commit '3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9':
docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
2015-02-27 17:00:10 +00:00
Luan Nguyen
dedba01ac8
am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs
...
* commit 'd57871e00d77bc852948de30a01b6856a6cfeb9b':
docs: Add steps to enable adb debugging on Wear device
2015-02-27 16:53:47 +00:00
Ryosuke Matsuuchi
d4cdf18e1c
am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs
...
* commit 'b859313312a85285c2c243a5e58d133e308ee590':
doc: Add Japanese version of DAC/distribute/ page.
2015-02-27 16:53:42 +00:00
