Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,839 Commits 3 Branches 0 Tags
052dce27c9bd59e8ee1cbf1b2bccb36167d04a9e
Commit Graph

252839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
20109a689d Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Alan Viverette
16b8941dba Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Alan Viverette
4e32b47c48 Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Alan Viverette
52306705c1 Merge "Override LinearLayout's onLayout pass in AlertDialogLayout" into nyc-mr1-dev 2016-08-24 18:17:04 +00:00
Andrew Rossignol
c35104535c ContextHub: Avoid reference leaks 
The ContextHub HAL was leaking references in passOnOsResponse. An
example of this is when a sensor hub reset occurs. If many of these
resets happen, the local reference pool is exhausted and a crash
in the HAL occurs.

Bug: 30706325
Change-Id: Ica5328137a7033f512d7fb1ccf6fa138eab55091
(cherry picked from commit 52dda59896)
 2016-08-24 18:15:38 +00:00
Android Build Merger (Role)
8ae79de881 Merge changes from topic 'am-25ded4410ce544918d9fbc387ab4e1e3' into cw-f-dev 
* changes:
  Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am: d90b69ffb1
  redact PII only for non-null value and apply SHA-1 am: d0a7649f53
 2016-08-24 18:14:01 +00:00
Andrew Rossignol
e914569fb8 Merge "Remove the incognito start page resource." into cw-f-dev 2016-08-24 18:13:03 +00:00
Chen Xu
3e73c0c93e Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev 
am: d90b69ffb1

Change-Id: Iab3db28183e0756f65c8ccea29196002fe608904
 2016-08-24 18:12:48 +00:00
fionaxu
00396c01f6 redact PII only for non-null value and apply SHA-1 
am: d0a7649f53

Change-Id: I4424a97dc00444df80c53fe4bbb20dfb7840e441
 2016-08-24 18:12:43 +00:00
Chen Xu
d90b69ffb1 Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev 2016-08-24 18:08:22 +00:00
Doris Ling
6165a83ee8 Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev 
am: d5f9642488

Change-Id: Ib3f80a096d333e7bd3dbdfb57a91be41d4aa823b
 2016-08-24 18:04:42 +00:00
Doris Ling
589ffca4de Add metrics logging for Settings -> Help & Feedback 
am: 319c806cc0

Change-Id: I32966869e910b4c6e36fe3245af2edfa7a6f6a87
 2016-08-24 18:04:39 +00:00
Doris Ling
d5f9642488 Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev 2016-08-24 18:01:28 +00:00
Alan Viverette
57143be4e4 Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f29f77f am: f9489216eb 
am: 6c1e7451b3

Change-Id: If5ce87ac37637948aae79af46ca54b4d4be13985
 2016-08-24 17:49:58 +00:00
Alan Viverette
cc0e9d795e Avoid potential re-entry as a result of child mutation am: 66b3a0d1aa am: 70ccc698ec 
am: 992ef58a33

Change-Id: Ie07b98d2006707d177beb2c43d31f3d28917dc91
 2016-08-24 17:49:55 +00:00
Alan Viverette
6c1e7451b3 Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f29f77f 
am: f9489216eb

Change-Id: If2389e3de3f5b511ed0ac7cee1025ec2d31cbabc
 2016-08-24 17:43:45 +00:00
Alan Viverette
992ef58a33 Avoid potential re-entry as a result of child mutation am: 66b3a0d1aa 
am: 70ccc698ec

Change-Id: Ia85253ba6ce6bece037717b7d87955dcac4e9f81
 2016-08-24 17:43:43 +00:00
Alan Viverette
f9489216eb Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev 
am: 462f29f77f

Change-Id: Iefb3d33a407aa719c988217b136187378617da8f
 2016-08-24 17:37:53 +00:00
Alan Viverette
70ccc698ec Avoid potential re-entry as a result of child mutation 
am: 66b3a0d1aa

Change-Id: I1fa6619145a6aaceb4c743d378fbc5b198da6cdd
 2016-08-24 17:37:50 +00:00
TreeHugger Robot
462f29f77f Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev 2016-08-24 17:27:09 +00:00
Tony Mantler
b07fc2c9bf Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev 
am: 97231323b7

Change-Id: Iae6db760981058999637d93017b1cb11c6ebb802
 2016-08-24 17:05:17 +00:00
Tony Mantler
7697ba2602 Fix AsyncTask to handle exceptions in doInBackground 
am: 78a8e9d293

Change-Id: Ie56e95882f0aa1224a4eb03ac25374bb08454d2c
 2016-08-24 17:05:13 +00:00
Tony Mantler
97231323b7 Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev 2016-08-24 17:00:04 +00:00
Salvador Martinez
18bf581c77 Added error handling to settings suggestions list 
The suggestions list in the summary page of the
settings app could sometimes cause a crash due to
an uncaught exception. Tis fixed now.

Bug: 30656840
Change-Id: If79f53e6a8c17a81653228d613797e94c473d410
(cherry picked from commit 60d92b3b83)
 2016-08-24 16:43:22 +00:00
Alan Viverette
11a84b8429 Ensure the layer drawable callback is set when loading from theme 
Previously we would skip setting the changing configurations and callback
if the drawable had been loaded post-inflation from a theme attribute.

Bug: 30756548
Change-Id: Ia5457723ae8a62506a7562299d3fe78ec21f8030
 2016-08-24 12:35:47 -04:00
Tenghui Zhu
f286d846f0 Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev 
am: 3512b0001a

Change-Id: Iac78966a4ff7d4d7bb6972a1624a7587b68c224e
 2016-08-24 16:29:40 +00:00
Teng-Hui Zhu
0bc9fa9896 Add an new internal DrawableContainer to handle animation scale == 0 case. 
am: 0c03664fa6

Change-Id: I7feae01c6302e2942087c6dfe1948109467f1326
 2016-08-24 16:28:55 +00:00
Alan Viverette
1bb8f51e76 Override LinearLayout's onLayout pass in AlertDialogLayout 
LinearLayout sets up internal state during onLayout that's missing when
we override onMeasure. Avoid calling super.onMeasure() by re-implementing
onLayout without the internal state dependencies.

Bug: 30494039
Change-Id: I1149517a2fe5f5afdb4125db5e7f573588fea740
 2016-08-24 12:26:27 -04:00
Tenghui Zhu
3512b0001a Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev 2016-08-24 16:22:38 +00:00
Rubin Xu
50c5f4ac38 Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev 
am: 4d826638ab

Change-Id: If6fa13004de30cef2c528a5fcdc460ff39f850cc
 2016-08-24 14:28:59 +00:00
Rubin Xu
6b3c49d2b8 Set DeviceLockedForUser state synchronously 
am: 9201a30a95

Change-Id: Ia046cbf84df5db428d54df56d744ae8d6da5521a
 2016-08-24 14:28:55 +00:00
Rubin Xu
4d826638ab Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev 2016-08-24 14:23:44 +00:00
Jaewan Kim
09a7a7b9f8 Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev 
am: 473c683ca6

Change-Id: Ieabb167fc67e4ea76dc52702eb88dac5f0667f10
 2016-08-24 05:39:52 +00:00
Jaewan Kim
ed3fd2743c MediaSessionService: Leave log for media key events 
am: 5e1476ecd7

Change-Id: I2b3ea66e3429c953e2008e41d10333cddbbc60c0
 2016-08-24 05:39:49 +00:00
Jaewan Kim
473c683ca6 Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev 2016-08-24 05:34:29 +00:00
Sungsoo Lim
9b5106a438 Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev 
am: c23c2771de

Change-Id: Iddb3cf4b3f3e008b0a6296824e4c9931bd4c7650
 2016-08-24 01:59:14 +00:00
Sungsoo
6dfc7abaf9 ExifInterface: Make saveAttributes throw an exception before change 
am: a8f9a075b1

Change-Id: I06620c9f70fb8642311d1029242aa6e5ab3f3344
 2016-08-24 01:59:11 +00:00
Sungsoo Lim
c23c2771de Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev 2016-08-24 01:53:22 +00:00
Winson
1abd27f466 Merge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev 
am: e846b18d33

Change-Id: I652b6dc925dc9e63806c26c705a6503bbf6bdc01
 2016-08-24 01:53:15 +00:00
Winson
fcf8f8382b Fixing issue with toasts not showing for guest users. 
am: 675c5d8e5a

Change-Id: Icd495e4f6dd9f8c7e10d6e88c8839ee358b1e41a
 2016-08-24 01:53:12 +00:00
TreeHugger Robot
e846b18d33 Merge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev 2016-08-24 01:47:20 +00:00
Jorim Jaggi
2bf085a3b4 Merge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev 
am: 6e370d35fe

Change-Id: I5c5e5505d7580705dcd3fb5e2bffb61b2dbf421c
 2016-08-24 01:36:40 +00:00
Jorim Jaggi
b0ba9599c8 Don't use fullscreen theme for forced resizable info activity 
am: 3f09052eb9

Change-Id: I3a965a0037fe1c22559567d74ee3a4a8c41bafea
 2016-08-24 01:36:35 +00:00
Steve McKay
b818058f4e DO NOT MERGE: Don't create DocumentInfo instances in background. 
Cursor access is not threadsafe resulting in operations on incorrect files.

Bug: 30082168
Change-Id: Ib36d5b7acdee9463b6ebd2553172e5ecb4d70857
 2016-08-24 01:34:45 +00:00
TreeHugger Robot
6e370d35fe Merge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev 2016-08-24 01:32:11 +00:00
Jorim Jaggi
9a0d881e3c Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev 
am: 5a10360d7e

Change-Id: I9afc277939d6cea0bc4a9cfea5dee10277b0ed74
 2016-08-24 01:26:46 +00:00
Jorim Jaggi
55f4b0e9be Remove swipe-up gesture from Tuner 
am: 3793aff806

Change-Id: I601fdce7b6e88e30b2ccfdf55d84ed41ff1d5e36
 2016-08-24 01:26:40 +00:00
Jaewan Kim
5e1476ecd7 MediaSessionService: Leave log for media key events 
Bug: 30212915
Change-Id: I6eb523bbbce2292b6b51d538d82ef4d0a8ba23b3
 2016-08-24 10:24:59 +09:00
TreeHugger Robot
5a10360d7e Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev 2016-08-24 01:21:07 +00:00
Winson
675c5d8e5a Fixing issue with toasts not showing for guest users. 
Bug: 30001278
Change-Id: I43269da8a6c41f4fec5923aafe5a624ec75ba651
 2016-08-23 17:22:32 -07:00