OSDN Git Service

android-x86/frameworks-base.git
8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 01:46:44 +0000 (01:46 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53  -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1 am: 249acab988  -s ours
am: aa93e8571f

Change-Id: Ic0996d300d9040c34df527244c9e39b2215f2d95

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 01:41:08 +0000 (01:41 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53  -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1
am: 249acab988  -s ours

Change-Id: Ia722ab69188cbf569a67c97d340da8634c2f7f7f

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am...
Sungsoo Lim [Tue, 19 Jul 2016 01:35:30 +0000 (01:35 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04  -s ours am: d1b350ce7d am: d8f381af5a am: e863a0c868 am: 16b9011dd5  -s ours
am: f5cddc7ef6

Change-Id: Ic7831519d3aacd7988960c1278bf8a6bf9b280a3

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 01:35:26 +0000 (01:35 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53  -s ours am: 3e4c8a96fa am: a1f106b558
am: 9e48fa5de1

Change-Id: I2e278c6a3cf3763520321253751fc55ba3026d59

8 years agoMerge "AAPT: Don't keep processing files that failed to be added" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 01:29:28 +0000 (01:29 +0000)]
Merge "AAPT: Don't keep processing files that failed to be added" into nyc-mr1-dev

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am...
Sungsoo Lim [Tue, 19 Jul 2016 01:28:08 +0000 (01:28 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04  -s ours am: d1b350ce7d am: d8f381af5a am: e863a0c868
am: 16b9011dd5  -s ours

Change-Id: I4814fcb307d5e577ed5b3ea3f66ab9949035e3ca

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161...
Sungsoo Lim [Tue, 19 Jul 2016 01:26:21 +0000 (01:26 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35  -s ours am: a2044118a5 am: e8a7640503 am: f98fcae527 am: 4f88587f65  -s ours
am: 3fc550a0e3

Change-Id: I41c724a0839ab43583dd1d4391302138f7e5605a

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 01:26:16 +0000 (01:26 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53  -s ours am: 3e4c8a96fa
am: a1f106b558

Change-Id: I8b67e9f8958f99adb0e07d4ad857ad8e388dfb54

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161...
Sungsoo Lim [Tue, 19 Jul 2016 01:19:16 +0000 (01:19 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35  -s ours am: a2044118a5 am: e8a7640503 am: f98fcae527
am: 4f88587f65  -s ours

Change-Id: I0da0be3e09c6f27ae6e88ad486c5f8d907e2728a

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am...
Sungsoo Lim [Tue, 19 Jul 2016 01:18:35 +0000 (01:18 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04  -s ours am: d1b350ce7d am: d8f381af5a
am: e863a0c868

Change-Id: Iac2d21886968fb4db06d0c136fad09730aa72662

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 01:18:25 +0000 (01:18 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53  -s ours
am: 3e4c8a96fa

Change-Id: Ieab0b4aa107ce1471d601ab65051d9ed0ec18e8a

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am...
Sungsoo Lim [Tue, 19 Jul 2016 01:13:53 +0000 (01:13 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04  -s ours am: d1b350ce7d
am: d8f381af5a

Change-Id: I80023836cc9fc1bda49c65d0f1cb819310fc1df3

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161...
Sungsoo Lim [Tue, 19 Jul 2016 01:12:40 +0000 (01:12 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35  -s ours am: a2044118a5 am: e8a7640503
am: f98fcae527

Change-Id: Ib968326fe95bbd34f50c7764a17b21af01e377a7

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 01:12:12 +0000 (01:12 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6 am: aa0ad336b6
am: 407bb6ad53  -s ours

Change-Id: I461f779db4fdb5c5f9170c6bb3941c5269d980f2

8 years agoMerge \"docs: Fixed indentation for android:required attribute\" into nyc-dev
Mark Lu [Tue, 19 Jul 2016 01:08:33 +0000 (01:08 +0000)]
Merge \"docs: Fixed indentation for android:required attribute\" into nyc-dev
am: 831ea9e190

Change-Id: Idf228fe63fcfa75c20fd755dd2b6b75a6bf48eaa

8 years agoMerge \"docs: fix typo error in class name\" into nyc-dev
Mark Lu [Tue, 19 Jul 2016 01:08:30 +0000 (01:08 +0000)]
Merge \"docs: fix typo error in class name\" into nyc-dev
am: 35d61e4117

Change-Id: I88bd65d22260d6f47905bed60ce7c0c58ed2bc0e

8 years agoMerge \\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\" into mnc...
Sungsoo Lim [Tue, 19 Jul 2016 01:08:25 +0000 (01:08 +0000)]
Merge \\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d am: f78637ff64  -s ours
am: 19d013d4e3

Change-Id: I866cc55f30a582ef95fb91a81528ad364eabfe98

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am...
Sungsoo Lim [Tue, 19 Jul 2016 01:08:17 +0000 (01:08 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04  -s ours
am: d1b350ce7d

Change-Id: I2dfbdb7f5b716d2795f883b333c1339c4fd6c0a3

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 01:08:02 +0000 (01:08 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6
am: aa0ad336b6

Change-Id: I58f0e3ddfb4b5e5289e0d79602747de1dfd0106b

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161...
Sungsoo Lim [Tue, 19 Jul 2016 01:03:18 +0000 (01:03 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35  -s ours am: a2044118a5
am: e8a7640503

Change-Id: I0e9a8731a75135d91103e1f3067aba2b1c90e79d

8 years agoMerge "docs: Fixed indentation for android:required attribute" into nyc-dev
TreeHugger Robot [Tue, 19 Jul 2016 00:59:25 +0000 (00:59 +0000)]
Merge "docs: Fixed indentation for android:required attribute" into nyc-dev

8 years agoMerge "docs: fix typo error in class name" into nyc-dev
TreeHugger Robot [Tue, 19 Jul 2016 00:56:28 +0000 (00:56 +0000)]
Merge "docs: fix typo error in class name" into nyc-dev

8 years agoMerge \\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\" into mnc-dev...
Sungsoo Lim [Tue, 19 Jul 2016 00:54:24 +0000 (00:54 +0000)]
Merge \\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d
am: f78637ff64  -s ours

Change-Id: Ia67c680bd2a72b7e0ce4f6d1225bc85b1b4feadb

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am...
Sungsoo Lim [Tue, 19 Jul 2016 00:53:31 +0000 (00:53 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508 am: 82a7ad2b09
am: 4e192f9a04  -s ours

Change-Id: I074d9e6bf5d08b760fd428eca04d4812899555b0

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 00:53:30 +0000 (00:53 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours
am: 6e0cedcaf6

Change-Id: Icd142cfe2b224c2f1c5c56175b955d9c65fbe195

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161...
Sungsoo Lim [Tue, 19 Jul 2016 00:53:14 +0000 (00:53 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35  -s ours
am: a2044118a5

Change-Id: Iacf1a129eded02dcfe14a13bbcc0b324b462ec4c

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am...
Sungsoo Lim [Tue, 19 Jul 2016 00:47:11 +0000 (00:47 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508
am: 82a7ad2b09

Change-Id: Ifb48dfec4944dfcdcbb1a7d5d36a30732fa058e6

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161
Sungsoo Lim [Tue, 19 Jul 2016 00:46:25 +0000 (00:46 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161
am: d35b114a35  -s ours

Change-Id: I33b922f13d4e9cfb6fdf2764f8e202eb38162e58

8 years agoMerge \\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\" into mnc-dev...
Sungsoo Lim [Tue, 19 Jul 2016 00:46:16 +0000 (00:46 +0000)]
Merge \\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\" into mnc-dev am: f4710c174f am: aa85bf99ee
am: 452dc91f2d

Change-Id: Ie64f0351a6cf2e4b07bffd85c6dbbd9d7239ce32

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6...
Sungsoo Lim [Tue, 19 Jul 2016 00:45:32 +0000 (00:45 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours
am: 3900104379  -s ours

Change-Id: I552387a6fa24b4c5d913b15990bd22b117a2f0d6

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3
Sungsoo Lim [Tue, 19 Jul 2016 00:40:46 +0000 (00:40 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3
am: 57aaad8161

Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours
Sungsoo Lim [Tue, 19 Jul 2016 00:40:42 +0000 (00:40 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours
am: 1ae841f508

Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad

8 years agoMerge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am...
Sungsoo Lim [Tue, 19 Jul 2016 00:38:54 +0000 (00:38 +0000)]
Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am: f4710c174f
am: aa85bf99ee

Change-Id: Id8919b1b3375f3a760800dbb45567a6023f4f611

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6
Sungsoo Lim [Tue, 19 Jul 2016 00:38:08 +0000 (00:38 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6
am: 710605dccf  -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558
Sungsoo Lim [Tue, 19 Jul 2016 00:32:38 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558
am: 3c979c6aa6

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface
Sungsoo Lim [Tue, 19 Jul 2016 00:32:25 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 9fffc56cb1  -s ours

Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96

8 years agoMerge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
Sungsoo Lim [Tue, 19 Jul 2016 00:32:24 +0000 (00:32 +0000)]
Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
am: f4710c174f

Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface
Sungsoo Lim [Tue, 19 Jul 2016 00:32:10 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 3261c5f7b3

Change-Id: If30d5ca6ebdc2e81ea2206c321940a32998b5d78

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface
Sungsoo Lim [Tue, 19 Jul 2016 00:23:32 +0000 (00:23 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 8dbf0b5558

Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed

8 years agoMerge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev
Sungsoo Lim [Tue, 19 Jul 2016 00:21:51 +0000 (00:21 +0000)]
Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev

8 years agoMerge changes I15da2563,I7845542d into nyc-mr1-dev
Tim Murray [Tue, 19 Jul 2016 00:20:01 +0000 (00:20 +0000)]
Merge changes I15da2563,I7845542d into nyc-mr1-dev

* changes:
  Don't reset current thread's priority accidentally.
  add tracepoint for when the display chain is stuffed

8 years agoAAPT: Don't keep processing files that failed to be added
Adam Lesinski [Tue, 19 Jul 2016 00:01:14 +0000 (17:01 -0700)]
AAPT: Don't keep processing files that failed to be added

AAPT will continue ahead without reporting an error if a file
failed to be added to the ResourceTable. This would cause crashes
later when the file was assumed to be present.

Bug:30200166
Change-Id: Ieb2daf97ccf0345153b6f4598d130a38d108c937

8 years agoMerge \"Include correct account id in action_called_account_remove log message.\...
Dmitry Dementyev [Mon, 18 Jul 2016 23:48:59 +0000 (23:48 +0000)]
Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev
am: 0544462bf1

Change-Id: Iaedf8dbf5fb7ee68eebe1026ab3867f544948db9

8 years agoMerge "Include correct account id in action_called_account_remove log message." into...
Dmitry Dementyev [Mon, 18 Jul 2016 23:37:29 +0000 (23:37 +0000)]
Merge "Include correct account id in action_called_account_remove log message." into nyc-dev

8 years agoMerge "Don't show repeated fingerprint error messages on bouncer" into nyc-mr1-dev
Selim Cinek [Mon, 18 Jul 2016 23:05:27 +0000 (23:05 +0000)]
Merge "Don't show repeated fingerprint error messages on bouncer" into nyc-mr1-dev

8 years agoMerge "Handle auto-unlocked managed profiles." into nyc-mr1-dev
Jeff Sharkey [Mon, 18 Jul 2016 23:02:45 +0000 (23:02 +0000)]
Merge "Handle auto-unlocked managed profiles." into nyc-mr1-dev

8 years agoMerge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 22:44:53 +0000 (22:44 +0000)]
Merge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
am: bd80098059

Change-Id: I6c643be53bdec19cfc1f814644f913621a6707ff

8 years agoDon't reset current thread's priority accidentally.
Tim Murray [Mon, 18 Jul 2016 22:35:42 +0000 (15:35 -0700)]
Don't reset current thread's priority accidentally.

If there's no RenderThread for the top app and FIFO UI is enabled, it's
possible to reset the current system_server thread's priority and
scheduler.

bug 30173296

Change-Id: I15da2563356ddd66911d695db43660ce5400da07

8 years agoadd tracepoint for when the display chain is stuffed
Tim Murray [Mon, 18 Jul 2016 21:11:28 +0000 (14:11 -0700)]
add tracepoint for when the display chain is stuffed

bug 30173296

Change-Id: I7845542d4e5c19ccb7c3ee6498cc2d70278b5397

8 years agoMerge "docs: Removed Sony Experia from N Preview download page" into nyc-dev
TreeHugger Robot [Mon, 18 Jul 2016 22:34:13 +0000 (22:34 +0000)]
Merge "docs: Removed Sony Experia from N Preview download page" into nyc-dev

8 years agoMerge "CameraMetadata JNI: Move tag lookup to common utility code" into nyc-mr1-dev
Eino-Ville Talvala [Mon, 18 Jul 2016 21:25:35 +0000 (21:25 +0000)]
Merge "CameraMetadata JNI: Move tag lookup to common utility code" into nyc-mr1-dev

8 years agoMerge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 21:15:53 +0000 (21:15 +0000)]
Merge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
am: 142d1214d0

Change-Id: I565e615e575eed25ae2957fbaf7de72b97541739

8 years agoMerge "docs: Late-breaking updates to DP5 release notes" into nyc-dev
TreeHugger Robot [Mon, 18 Jul 2016 21:07:34 +0000 (21:07 +0000)]
Merge "docs: Late-breaking updates to DP5 release notes" into nyc-dev

8 years agoMerge "Record UID of wakeup packets" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:58:13 +0000 (20:58 +0000)]
Merge "Record UID of wakeup packets" into nyc-mr1-dev

8 years agoMerge "Fix vulnerability in LockSettings service" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:54:44 +0000 (20:54 +0000)]
Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev

8 years agoMerge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev
Tyler Gunn [Mon, 18 Jul 2016 20:13:31 +0000 (20:13 +0000)]
Merge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev

8 years agoMerge \"docs: remove trailing white space from jd files\" into nyc-dev
Mark Lu [Mon, 18 Jul 2016 19:55:28 +0000 (19:55 +0000)]
Merge \"docs: remove trailing white space from jd files\" into nyc-dev
am: 242f5798ac

Change-Id: I6d0c57812a6af0663f483a26aa037a85cd84838c

8 years agoMerge "docs: remove trailing white space from jd files" into nyc-dev
Mark Lu [Mon, 18 Jul 2016 19:48:50 +0000 (19:48 +0000)]
Merge "docs: remove trailing white space from jd files" into nyc-dev

8 years agoRecord UID of wakeup packets
Adam Lesinski [Thu, 14 Jul 2016 23:56:08 +0000 (16:56 -0700)]
Record UID of wakeup packets

Bug:28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73

8 years agoMerge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_med...
smain@google.com [Mon, 18 Jul 2016 19:27:18 +0000 (19:27 +0000)]
Merge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\" into nyc-dev
am: 56bacea883

Change-Id: I00dbf309d7e1c79d93733e6c3aa08ec7eca41401

8 years agoMerge "add redirect for "getting started" help button in Studio. Also add ?utm_medium...
Scott Main [Mon, 18 Jul 2016 19:19:45 +0000 (19:19 +0000)]
Merge "add redirect for "getting started" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics" into nyc-dev

8 years agoadd redirect for "getting started" help button in Studio.
smain@google.com [Fri, 15 Jul 2016 22:25:25 +0000 (15:25 -0700)]
add redirect for "getting started" help button in Studio.
Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics

Change-Id: I914d4fac51d3cf7e839a7b5785a7c8cd43b57346

8 years agoMerge "Fixed bugreport share dialog padding." into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 18:37:34 +0000 (18:37 +0000)]
Merge "Fixed bugreport share dialog padding." into nyc-mr1-dev

8 years agoInclude correct account id in action_called_account_remove log message.
Dmitry Dementyev [Fri, 8 Jul 2016 17:46:22 +0000 (10:46 -0700)]
Include correct account id in action_called_account_remove log message.

Bug: 30013930

Change-Id: I857866e224d8dbc986c3b7e83a5f4e899e09f3ab

8 years agodocs: Late-breaking updates to DP5 release notes
Andrew Solovay [Mon, 18 Jul 2016 18:12:49 +0000 (11:12 -0700)]
docs: Late-breaking updates to DP5 release notes

See first comment for doc stage location.

Change-Id: Ib1ea6047d2b8d1ea9ff7e749ae380df65853b7c0

8 years agoMerge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev
Makoto Onuki [Mon, 18 Jul 2016 17:50:24 +0000 (17:50 +0000)]
Merge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev

8 years agoMerge "Remove the DMAgent whitelisting" into nyc-mr1-dev
Makoto Onuki [Mon, 18 Jul 2016 17:50:17 +0000 (17:50 +0000)]
Merge "Remove the DMAgent whitelisting" into nyc-mr1-dev

8 years agoMerge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev
Abodunrinwa Toki [Mon, 18 Jul 2016 17:49:25 +0000 (17:49 +0000)]
Merge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev

8 years agoMerge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev
Hall Liu [Mon, 18 Jul 2016 17:44:38 +0000 (17:44 +0000)]
Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev

8 years agodocs: remove trailing white space from jd files
Mark Lu [Mon, 18 Jul 2016 17:42:11 +0000 (10:42 -0700)]
docs: remove trailing white space from jd files

Change-Id: Id7fb958460bf2f28d88c6120df0395690f32783a

8 years agoMerge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am: 872ecfb0bf"...
Android Build Merger (Role) [Mon, 18 Jul 2016 17:29:41 +0000 (17:29 +0000)]
Merge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am: 872ecfb0bf" into nyc-mr1-dev

8 years agoMerge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
Chris Tate [Mon, 18 Jul 2016 17:29:37 +0000 (17:29 +0000)]
Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev

8 years agoMerge \"docs: Added support library 24.1.0\" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 17:29:02 +0000 (17:29 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am: 872ecfb0bf

Change-Id: I6ba46b8efcc8567d6192ac274e08ed1489cb0c2e

8 years agoMerge "docs: Added support library 24.1.0" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 17:16:59 +0000 (17:16 +0000)]
Merge "docs: Added support library 24.1.0" into nyc-dev

8 years agodocs: Removed Sony Experia from N Preview download page
Andrew Solovay [Mon, 18 Jul 2016 17:14:31 +0000 (10:14 -0700)]
docs: Removed Sony Experia from N Preview download page

See first comment for doc stage location.

Change-Id: Ib26adafa1ef4d7a104abd1d007ee2f3410bca200

8 years agodocs: fix typo error in class name
Mark Lu [Mon, 18 Jul 2016 16:50:26 +0000 (09:50 -0700)]
docs: fix typo error in class name

Fixes the class name in the code sample

Bug: 25072103
Change-Id: I681901502e100b9514f579c46be9ed7a37352426

8 years agoHandle auto-unlocked managed profiles.
Jeff Sharkey [Mon, 18 Jul 2016 16:11:36 +0000 (10:11 -0600)]
Handle auto-unlocked managed profiles.

There are cases where a managed profile provides an auth challenge
which is really an automatic unlock as a side effect from the parent
profile being unlocked.  Detect this case and suppress PRE_BOOT
notifications.

Bug: 29931646
Change-Id: I801605b0b59a7924bfe7f433415d9704664a5cbc

8 years agoDoc change: updated issues in DP5 release notes.
Dirk Dougherty [Mon, 18 Jul 2016 15:21:11 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am: 73b700404c

Change-Id: Id7bb33217a91f0e37497c83c6e4efbce8743df8b

8 years agoDoc change: updated issues in DP5 release notes.
Dirk Dougherty [Mon, 18 Jul 2016 15:09:24 +0000 (08:09 -0700)]
Doc change: updated issues in DP5 release notes.

Change-Id: I8c5af9a9523be71451a23bbac9b34da5079dbc27

8 years agoMerge \"update the version number used in docs and update the offline docs landing...
smain@google.com [Mon, 18 Jul 2016 15:07:55 +0000 (15:07 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am: 6623f4177c

Change-Id: I60626863804f787bf5e1435003d730427f1254df

8 years agoMerge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am: e92ebf66...
Android Build Merger (Role) [Mon, 18 Jul 2016 15:03:02 +0000 (15:03 +0000)]
Merge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am: e92ebf666e" into nyc-mr1-dev

8 years agoMerge \"Doc change: updates for DP5 release notes.\" into nyc-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:02:29 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am: e92ebf666e

Change-Id: I7df3eb17a67a1ddc2019644d1efadacb149dcf48

8 years agoMerge "Add an isListen method to NetworkRequests." into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 15:00:20 +0000 (15:00 +0000)]
Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev

8 years agoMerge "update the version number used in docs and update the offline docs landing...
Scott Main [Mon, 18 Jul 2016 14:57:37 +0000 (14:57 +0000)]
Merge "update the version number used in docs and update the offline docs landing page" into nyc-dev

8 years agoMerge "Use "real" display size for computing available densities" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 14:53:55 +0000 (14:53 +0000)]
Merge "Use "real" display size for computing available densities" into nyc-mr1-dev

8 years agoMerge "Doc change: updates for DP5 release notes." into nyc-dev
Dirk Dougherty [Mon, 18 Jul 2016 14:52:44 +0000 (14:52 +0000)]
Merge "Doc change: updates for DP5 release notes." into nyc-dev

8 years agoMerge "Do not allow to disable package "android"" into nyc-mr1-dev
Ricky Wai [Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)]
Merge "Do not allow to disable package "android"" into nyc-mr1-dev

8 years agoDo not allow to disable package "android"
Ricky Wai [Fri, 15 Jul 2016 14:44:07 +0000 (15:44 +0100)]
Do not allow to disable package "android"

Bug: 25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6

8 years agoMerge \"Check uid for notification policy access.\" into nyc-dev
Julia Reynolds [Mon, 18 Jul 2016 13:25:54 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am: 8f17d2a48b

Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59

8 years agoMerge "Check uid for notification policy access." into nyc-dev
Julia Reynolds [Mon, 18 Jul 2016 13:16:15 +0000 (13:16 +0000)]
Merge "Check uid for notification policy access." into nyc-dev

8 years agoAdd an isListen method to NetworkRequests.
Lorenzo Colitti [Mon, 18 Jul 2016 09:17:08 +0000 (18:17 +0900)]
Add an isListen method to NetworkRequests.

This allows simplification of the ConnectivityService code.

Bug: 23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd

8 years agoDO NOT MERGE: Remove the use of JHEAD in ExifInterface
Sungsoo Lim [Wed, 13 Jul 2016 00:31:16 +0000 (09:31 +0900)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface

Bug: 29270469
Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f

8 years agoDoc change: updates for DP5 release notes.
Dirk Dougherty [Mon, 18 Jul 2016 03:59:36 +0000 (20:59 -0700)]
Doc change: updates for DP5 release notes.

Change-Id: I39cca9088d6fc5952a359f42e43a324aad4427f0

8 years agoDO NOT MERGE: FloatingToolbar - Check that app supports RTL.
Abodunrinwa Toki [Sun, 17 Jul 2016 18:25:27 +0000 (19:25 +0100)]
DO NOT MERGE: FloatingToolbar - Check that app supports RTL.

Port I36c0d72984e0abc7c6430cc7d52d8efd7341820e to nyc-mr1-dev.

Bug: 29932935
Change-Id: Icd085508f7d1dd412f4d0805e8fd01734743648e

8 years agoMerge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev
Abodunrinwa Toki [Sun, 17 Jul 2016 18:07:08 +0000 (18:07 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev

8 years agoMerge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into...
Tim Murray [Sat, 16 Jul 2016 19:14:29 +0000 (19:14 +0000)]
Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev

8 years agoMake sure StrictMode allows disk reads when calling isThreadInProcess.
Tim Murray [Sat, 16 Jul 2016 18:28:40 +0000 (11:28 -0700)]
Make sure StrictMode allows disk reads when calling isThreadInProcess.

If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.

bug 30170339

Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1

8 years agoMerge "Deprecate Resources constructor and updateConfiguration() method" into nyc...
TreeHugger Robot [Sat, 16 Jul 2016 02:33:54 +0000 (02:33 +0000)]
Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev

8 years agoFrameworks/base: Fix braino missing line
Andreas Gampe [Sat, 16 Jul 2016 01:12:02 +0000 (18:12 -0700)]
Frameworks/base: Fix braino missing line

This got accidentally deleted in cleanup.

Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb

8 years agoDeprecate Resources constructor and updateConfiguration() method
Adam Lesinski [Sat, 16 Jul 2016 00:49:49 +0000 (17:49 -0700)]
Deprecate Resources constructor and updateConfiguration() method

These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().

Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a