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

314793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
7700c2b238 Merge "Fix API feedback on Color" into oc-dev 
am: 03758701fb

Change-Id: I5b3d30552adedc603a97b65b1f739c19142e70b2
 2017-04-14 20:49:20 +00:00
Mady Mellor
daf76b82ae Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 
am: 4b7b01c1cc

Change-Id: Ib51c0125042553302584c79a360ee07f2ae1c1b8
 2017-04-14 20:48:02 +00:00
TreeHugger Robot
03758701fb Merge "Fix API feedback on Color" into oc-dev 2017-04-14 20:42:19 +00:00
Mady Mellor
4b7b01c1cc Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev 2017-04-14 20:40:03 +00:00
Nathan Harold
3ce4d95d22 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev 
am: 9361283073

Change-Id: I4ca6b6293dabe856098dda98ce6ca804fa419b44
 2017-04-14 20:28:56 +00:00
Nathan Harold
9361283073 Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev 
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
 2017-04-14 20:21:17 +00:00
Android Build Merger (Role)
7750ab39b2 Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 am: 45bd03914c -s ours" into oc-dev-plus-aosp 2017-04-14 20:11:00 +00:00
Andrew Zeng
1834250bbe Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 
am: 45bd03914c  -s ours

Change-Id: Iadf1027f7bc9d9bc31264341cb6797ae241882fd
 2017-04-14 20:09:46 +00:00
Andrew Zeng
1ba83de49e Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours am: 812594f573 -s ours 
am: d210ce63d0

Change-Id: Ic2932b7fd206c72de0fe78fd604effd8603cc8e7
 2017-04-14 20:08:35 +00:00
Andrew Zeng
d210ce63d0 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours 
am: 812594f573  -s ours

Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c
 2017-04-14 20:03:20 +00:00
Andrew Zeng
45bd03914c Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours 
am: 812594f573

Change-Id: Ifb03ad1b13aa59e18ff658f6a0a5779d42d1d226
 2017-04-14 20:02:57 +00:00
Andrew Zeng
812594f573 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 
am: 2c42db20e4  -s ours

Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975
 2017-04-14 19:52:58 +00:00
Andrew Zeng
2c42db20e4 Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev 2017-04-14 19:40:57 +00:00
Adrian Roos
a1da551856 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 
am: b160141698

Change-Id: I22c165cb1a366e967bebf369ed79eaf86da995a4
 2017-04-14 19:35:31 +00:00
TreeHugger Robot
b160141698 Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev 2017-04-14 19:24:40 +00:00
Android Build Merger (Role)
09414003f5 Merge "Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev am: 28dab313ee" into oc-dev-plus-aosp 2017-04-14 19:10:55 +00:00
Christopher Tate
b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 
am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
 2017-04-14 19:09:27 +00:00
Hall Liu
1dd67517ab Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad am: 8fa1c9c899 
am: 00cf4637d2

Change-Id: I257f3ed9143f8d35202f461a0e2522f65c30177b
 2017-04-14 19:06:37 +00:00
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Julia Reynolds
00ac29e3dd Merge "Synchronize access to ranking helper records." into oc-dev 
am: bf777d46f2

Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
 2017-04-14 18:56:18 +00:00
TreeHugger Robot
bf777d46f2 Merge "Synchronize access to ranking helper records." into oc-dev 2017-04-14 18:52:40 +00:00
Hall Liu
00cf4637d2 Merge "Helper method in VideoCallImpl for testing" am: 14d27fccad 
am: 8fa1c9c899

Change-Id: I148108bcf8636d553852201b0a70e9cfc97d7d44
 2017-04-14 18:43:19 +00:00
Hall Liu
8fa1c9c899 Merge "Helper method in VideoCallImpl for testing" 
am: 14d27fccad

Change-Id: I5e298b40a83041d759e9e5c59d51be0ec5450d11
 2017-04-14 18:39:18 +00:00
Julia Reynolds
7e0a00e387 Merge "Lock access to managed services." into oc-dev 
am: 8ac1452288

Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
 2017-04-14 18:34:01 +00:00
Hall Liu
14d27fccad Merge "Helper method in VideoCallImpl for testing" 2017-04-14 18:30:26 +00:00
Matt Sarett
7e92ac449b Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 
am: 101dc265a8

Change-Id: Ia6d620a6f4df4e7fdbceae5a6f3bc524aae4358e
 2017-04-14 18:29:16 +00:00
TreeHugger Robot
8ac1452288 Merge "Lock access to managed services." into oc-dev 2017-04-14 18:28:38 +00:00
TreeHugger Robot
101dc265a8 Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev 2017-04-14 18:21:46 +00:00
Tsukasa Hashimoto
4ae323995d Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89 
am: 5dbe26f0f1

Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
 2017-04-14 18:19:22 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822 
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
 2017-04-14 18:13:50 +00:00
Vikas Marwaha
358ec57382 Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 
am: e768104f9b

Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
 2017-04-14 18:13:49 +00:00
Tsukasa Hashimoto
5d57502c89 Merge "Add PID info into ANR crash log header" 
am: 2fe972c822

Change-Id: Ib7ec151a3a4b1759022a9a663836a73087ea85ec
 2017-04-14 18:09:56 +00:00
Vikas Marwaha
e768104f9b Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev 2017-04-14 18:06:24 +00:00
Treehugger Robot
2fe972c822 Merge "Add PID info into ANR crash log header" 2017-04-14 18:03:12 +00:00
Wale Ogunwale
7654775b8a Merge "Move stack to front in-sync with task reparenting" into oc-dev 
am: c4555784be

Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
 2017-04-14 17:41:52 +00:00
Svet Ganov
651a974dd1 Fix NPE in autofill 
am: 833c68e9fd

Change-Id: Iabfff7d35836149e3b823ff7bb05fdaf555c0ea4
 2017-04-14 17:40:40 +00:00
Wale Ogunwale
c4555784be Merge "Move stack to front in-sync with task reparenting" into oc-dev 2017-04-14 17:33:03 +00:00
Svet Ganov
833c68e9fd Fix NPE in autofill 
Test: manual

bug:37330744

Change-Id: I110ece0b9283adb9998f8df795e2107da772482e
 2017-04-14 17:29:51 +00:00
Daniel Nishi
33f74edaa4 Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 
am: 864d53d6fc

Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
 2017-04-14 17:18:40 +00:00
Dongwon Kang
294176e988 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 
am: 0cdc7c8874

Change-Id: I6d6f9739809aa04ae4f9a23a7d401df990226ded
 2017-04-14 17:13:49 +00:00
Daniel Nishi
864d53d6fc Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 2017-04-14 17:11:30 +00:00
Julia Reynolds
4401196798 Synchronize access to ranking helper records. 
Fixes: 36282438
Test: fix is mostly hypothetical. did try clearing data
on a lot of apps while a backup was in process.

Change-Id: I58977a972d187bce2c013d55a95298b23bc0eda8
 2017-04-14 17:06:03 +00:00
Dongwon Kang
0cdc7c8874 Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev 2017-04-14 17:05:31 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
 2017-04-14 17:04:19 +00:00
Julia Reynolds
00314d97e9 Lock access to managed services. 
Fixes: 35873807
Test: manual, set a notification to enqueue once a second for a few
minutes while also repeatedly granting and denying notification listener
access to a couple of apps in Settings and verifying
that nothing crashes and log is clean.

Change-Id: I15f429d61bf5f9ad639e524a94288a6d2db2cb56
 2017-04-14 12:59:47 -04:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Wale Ogunwale
2719cc134e Move stack to front in-sync with task reparenting 
When reparenting a task to another stack have window manager move the
destination stack to the front at the same time it is reparenting the
task if REPARENT_MOVE_STACK_TO_FRONT is set to avoid jank.

Test: manual
Bug: 37299899
Change-Id: I45678e742188a4871f93a11178f7ab2b60c7bcc3
 2017-04-14 09:45:27 -07:00
Alan Viverette
2de6b0dab0 Merge "Update more implementations of findViewById()" into oc-dev 
am: b7f0db8d89

Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
 2017-04-14 16:33:14 +00:00
Matt Sarett
ca9b703b88 Bug fix: use legacy SkCanvas regardless of color space tag 
Test: Added unit test. CtsGraphicsModule.

Bug: 32984164

Change-Id: If72e1e31c98e01f97f3a05d763f5d4c71cf88313
 2017-04-14 16:26:50 +00:00
TreeHugger Robot
b7f0db8d89 Merge "Update more implementations of findViewById()" into oc-dev 2017-04-14 16:26:27 +00:00