drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,309 Commits 1 Branch 0 Tags
Commit Graph

249309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hufnagle
b79aac7a0e Merge "docs: Added metadata to display AdMob Udacity resource card" into nyc-dev 2016-07-19 03:05:36 +00:00
Kevin Hufnagle
e25fd0eda8 Merge "docs: Edited phrasing for "orderId is blank with test IAP purchases"" into nyc-dev 2016-07-19 03:05:09 +00:00
TreeHugger Robot
878bd5103e Merge "Update bugreport dialog to DeviceDefault theme." into nyc-mr1-dev 2016-07-19 02:03:55 +00:00
TreeHugger Robot
e5aeca3dc9 Merge "Cleanup TwilightService" into nyc-mr1-dev 2016-07-19 02:02:07 +00:00
Sungsoo Lim
e6c39fb5b3 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
 2016-07-19 01:46:44 +00:00
Sungsoo Lim
aa93e8571f 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
 2016-07-19 01:41:08 +00:00
Sungsoo Lim
2991db7ed2 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
 2016-07-19 01:35:30 +00:00
Sungsoo Lim
249acab988 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
 2016-07-19 01:35:26 +00:00
TreeHugger Robot
d94f55552f Merge "AAPT: Don't keep processing files that failed to be added" into nyc-mr1-dev 2016-07-19 01:29:29 +00:00
Sungsoo Lim
f5cddc7ef6 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
 2016-07-19 01:28:08 +00:00
Sungsoo Lim
3ab0b4a1a8 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
 2016-07-19 01:26:21 +00:00
Sungsoo Lim
9e48fa5de1 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
 2016-07-19 01:26:16 +00:00
Sungsoo Lim
3fc550a0e3 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
 2016-07-19 01:19:16 +00:00
Sungsoo Lim
16b9011dd5 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
 2016-07-19 01:18:35 +00:00
Sungsoo Lim
a1f106b558 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
 2016-07-19 01:18:25 +00:00
Sungsoo Lim
e863a0c868 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
 2016-07-19 01:13:53 +00:00
Sungsoo Lim
4f88587f65 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
 2016-07-19 01:12:40 +00:00
Sungsoo Lim
3e4c8a96fa 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
 2016-07-19 01:12:12 +00:00
Mark Lu
bf441b392b Merge \"docs: Fixed indentation for android:required attribute\" into nyc-dev 
am: 831ea9e190

Change-Id: Idf228fe63fcfa75c20fd755dd2b6b75a6bf48eaa
 2016-07-19 01:08:33 +00:00
Mark Lu
9d7d33a407 Merge \"docs: fix typo error in class name\" into nyc-dev 
am: 35d61e4117

Change-Id: I88bd65d22260d6f47905bed60ce7c0c58ed2bc0e
 2016-07-19 01:08:30 +00:00
Sungsoo Lim
091cdab02d 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
 2016-07-19 01:08:25 +00:00
Sungsoo Lim
d8f381af5a 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
 2016-07-19 01:08:17 +00:00
Sungsoo Lim
407bb6ad53 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
 2016-07-19 01:08:02 +00:00
Sungsoo Lim
f98fcae527 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
 2016-07-19 01:03:18 +00:00
TreeHugger Robot
831ea9e190 Merge "docs: Fixed indentation for android:required attribute" into nyc-dev 2016-07-19 00:59:27 +00:00
TreeHugger Robot
35d61e4117 Merge "docs: fix typo error in class name" into nyc-dev 2016-07-19 00:56:29 +00:00
Sungsoo Lim
19d013d4e3 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
 2016-07-19 00:54:24 +00:00
Sungsoo Lim
d1b350ce7d 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
 2016-07-19 00:53:31 +00:00
Sungsoo Lim
aa0ad336b6 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
 2016-07-19 00:53:30 +00:00
Sungsoo Lim
e8a7640503 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35 -s ours 
am: a2044118a5

Change-Id: Iacf1a129eded02dcfe14a13bbcc0b324b462ec4c
 2016-07-19 00:53:14 +00:00
Sungsoo Lim
4e192f9a04 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 
am: 82a7ad2b09

Change-Id: Ifb48dfec4944dfcdcbb1a7d5d36a30732fa058e6
 2016-07-19 00:47:11 +00:00
Sungsoo Lim
a2044118a5 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 
am: d35b114a35  -s ours

Change-Id: I33b922f13d4e9cfb6fdf2764f8e202eb38162e58
 2016-07-19 00:46:25 +00:00
Sungsoo Lim
f78637ff64 Merge \\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\" into mnc-dev am: f4710c174f am: aa85bf99ee 
am: 452dc91f2d

Change-Id: Ie64f0351a6cf2e4b07bffd85c6dbbd9d7239ce32
 2016-07-19 00:46:16 +00:00
Sungsoo Lim
6e0cedcaf6 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
 2016-07-19 00:45:32 +00:00
Sungsoo Lim
d35b114a35 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 
am: 57aaad8161

Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698
 2016-07-19 00:40:46 +00:00
Sungsoo Lim
82a7ad2b09 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours 
am: 1ae841f508

Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad
 2016-07-19 00:40:42 +00:00
Sungsoo Lim
452dc91f2d Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am: f4710c174f 
am: aa85bf99ee

Change-Id: Id8919b1b3375f3a760800dbb45567a6023f4f611
 2016-07-19 00:38:54 +00:00
Christopher Tate
ac482ebb00 Back up wallpapers via staged copies, not hard links 
File-based encryption regimes turn out to make the zero-copy approach
unworkable.  We now copy the file to the local stage for backup purposes,
making sure only to refresh the copy when it changes.

Bug 30201058

Change-Id: Ie3f29ed63f778e3e0e00d1cf56b0bb37553b7823
 2016-07-18 17:38:41 -07:00
Sungsoo Lim
3900104379 DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 
am: 710605dccf  -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737
 2016-07-19 00:38:08 +00:00
Sungsoo Lim
710605dccf DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 
am: 3c979c6aa6

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b
 2016-07-19 00:32:38 +00:00
Sungsoo Lim
1ae841f508 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
am: 9fffc56cb1  -s ours

Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96
 2016-07-19 00:32:25 +00:00
Sungsoo Lim
aa85bf99ee Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev 
am: f4710c174f

Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3
 2016-07-19 00:32:24 +00:00
Sungsoo Lim
57aaad8161 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
am: 3261c5f7b3

Change-Id: If30d5ca6ebdc2e81ea2206c321940a32998b5d78
 2016-07-19 00:32:10 +00:00
Sungsoo Lim
3c979c6aa6 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
am: 8dbf0b5558

Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed
 2016-07-19 00:23:32 +00:00
Sungsoo Lim
f4710c174f Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev 2016-07-19 00:21:53 +00:00
Tim Murray
7b8b1aab93 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
 2016-07-19 00:20:02 +00:00
Andrew Sapperstein
59b5679730 Update bugreport dialog to DeviceDefault theme. 
By using DeviceDefault instead of Material, this UI is now
resilient to any platform-level theme changes.

Change-Id: I43ce61b36f4c089ee07f754088abe2dfe6700877
Fixes: 30173174
 2016-07-18 17:19:15 -07:00
Chien-Yu Chen
ca979b9d89 ImageReader: Make close thread safe 
Bug: 30191606
Change-Id: Ic5b53c416a7fe3ebcaad2ab78f2e9aef3b790c88
 2016-07-18 17:14:27 -07:00
Ruben Brunk
0ec069ac6b Return empty set instead of null when user is not set. 
- Avoid iterating over null set when checking components for user
  that isn't currently active.  This can happen if the user is changed,
  and the enabled component set is queried before the set has been
  rebuilt to include components for the new current user.

Bug: 30165350
Change-Id: I4dadad84e6bd2728bea5711b936cba91f6791c99
 2016-07-18 17:08:55 -07:00
Adam Lesinski
526d73be4a 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
 2016-07-18 17:07:41 -07:00