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

296248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
f2f406cade Merge "Treat everyone the same, redux." 2016-11-16 17:58:24 +00:00
Sergei Vasilinetc
5e3935eca2 Merge "Support hardware bitmaps in bitmap shaders" 2016-11-16 17:43:09 +00:00
TreeHugger Robot
b11f283088 Merge "Use safe access to OnPreDrawListener." 2016-11-16 17:20:07 +00:00
Jean-Michel Trivi
ac4a8b7f05 Merge "Refactor SoundPool for appOps handling through PlayerBase" 2016-11-16 16:20:57 +00:00
TreeHugger Robot
868297495b Merge "Test for null context in getPrivateKey" 2016-11-16 14:43:23 +00:00
Shawn Willden
dea6614603 Test for null context in getPrivateKey 
In N, passing a null context to getPrivateKey provoked a
NullPointerException, which is validated by a CTS test. In commit
28d68b1 this behavior was changed (inadvertently, I believe) causing
getPrivateKey to wrap the NPE in a KeyChainException. This CL restores
the previous behavior, fixing the test and avoiding breaking any apps
that were catching the NPE.

Test: Fixing broken test
Change-Id: Icb0c75b03efc478b7310998cf3e7108a2c419107
 2016-11-16 06:06:36 -07:00
Michal Karpinski
75ec5465f0 Merge "Fix disabling DO single user features when clearDeviceOwner() is called" 2016-11-16 11:46:18 +00:00
Martijn Coenen
7b4d850187 Fix call to deprecated range_x(). 
Test: master builds again.
Change-Id: I0fa7627c7ec28317dd7e37cca93d2b2c90e6d1ea
 2016-11-16 11:33:37 +01:00
Martijn Coenen
bbec302fcf Merge "Fix deprecated range_x calls." am: 87cafe8f33 am: d03b17c29a am: 6e2c276c78 
am: f4a0f12eb7

Change-Id: Ifdec08542102cf4eba2aa9baf206272523b56894
 2016-11-16 10:30:15 +00:00
Martijn Coenen
f4a0f12eb7 Merge "Fix deprecated range_x calls." am: 87cafe8f33 am: d03b17c29a 
am: 6e2c276c78

Change-Id: I6511ef9ccc352c43c7fa5924e1246449be7c3a0e
 2016-11-16 10:19:30 +00:00
Martijn Coenen
6e2c276c78 Merge "Fix deprecated range_x calls." am: 87cafe8f33 
am: d03b17c29a

Change-Id: I70280eb85b9430c23f6b2681375cbcfa9da2dd38
 2016-11-16 10:07:54 +00:00
Martijn Coenen
d03b17c29a Merge "Fix deprecated range_x calls." 
am: 87cafe8f33

Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d
 2016-11-16 10:00:23 +00:00
Diego Perez
5d26963fe2 Merge "More layoutlib testing infra fixes" 2016-11-16 09:54:51 +00:00
Martijn Coenen
87cafe8f33 Merge "Fix deprecated range_x calls." 2016-11-16 09:48:31 +00:00
Hidenari Koshimae
5731460c4c Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa am: 9997fcc72c am: 9f0cc266ce 
am: 2b08faf2cc

Change-Id: I4fdd59a4530dea9375e5c38a9ce2337281b65e3c
 2016-11-16 08:33:33 +00:00
Hidenari Koshimae
2b08faf2cc Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa am: 9997fcc72c 
am: 9f0cc266ce

Change-Id: I75127bfd0fc4ce9256c775eaeb46582afd637e8d
 2016-11-16 08:26:00 +00:00
Hidenari Koshimae
9f0cc266ce Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa 
am: 9997fcc72c

Change-Id: Ie09949fbc23ad87e159e063a59983a1a6bff98f8
 2016-11-16 08:18:30 +00:00
Hidenari Koshimae
9997fcc72c Merge "CountDownTimer: not skip onTick()" 
am: 224d9e48fa

Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c
 2016-11-16 08:10:54 +00:00
Treehugger Robot
224d9e48fa Merge "CountDownTimer: not skip onTick()" 2016-11-16 07:55:27 +00:00
TreeHugger Robot
f6f105072e Merge "Import translations. DO NOT MERGE" 2016-11-16 07:27:57 +00:00
TreeHugger Robot
632dc16bbb Merge "Import translations. DO NOT MERGE" 2016-11-16 07:25:36 +00:00
TreeHugger Robot
ef6d44bf7e Merge "Import translations. DO NOT MERGE" 2016-11-16 05:59:06 +00:00
TreeHugger Robot
52f9473e57 Merge "Use StartFuseBridgeLoop function instead of FuseBridgeLoop class." 2016-11-16 05:30:09 +00:00
Bill Yi
a5e23567bc Import translations. DO NOT MERGE 
Change-Id: I8ac518af567b4e189fbd9749482bb3e11d2dfecd
Auto-generated-cl: translation import
 2016-11-15 20:21:13 -08:00
Scott Main
7f26765d37 Merge "Add cross-links between FINE and COARSE location permissions. bug: 25371600" 2016-11-16 04:07:27 +00:00
TreeHugger Robot
325fd657b9 Merge "Fixed obsolete comment." 2016-11-16 04:07:11 +00:00
longhai
1d687df2f7 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 am: 2be54fde72 am: 5c152a3d7f 
am: d7e2ae5fc7

Change-Id: I9b24f761959dfe7a88509b65273e31916d9ddfc1
 2016-11-16 03:28:17 +00:00
TreeHugger Robot
26c48fac73 Merge changes I99813278,I6285042b 
* changes:
  Fix copypasta error.
  Aggressively clear cached data when forgetting.
 2016-11-16 03:21:17 +00:00
longhai
d7e2ae5fc7 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 am: 2be54fde72 
am: 5c152a3d7f

Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
 2016-11-16 03:18:08 +00:00
longhai
5c152a3d7f Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 
am: 2be54fde72

Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
 2016-11-16 03:11:09 +00:00
longhai
2be54fde72 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 
am: 1813ae0159

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
 2016-11-16 03:04:38 +00:00
Treehugger Robot
1813ae0159 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 2016-11-16 02:54:26 +00:00
sergeyv
554ffeb8b7 Support hardware bitmaps in bitmap shaders 
Test: hwuimacro bitmapShaderEglImage --onscreen.
bug:30999911
Change-Id: I9d16a1c217a4474841794cf27ce49e3f7823678e
 2016-11-15 18:43:09 -08:00
Seigo Nonaka
9669487d00 Merge "Move test only initialization to each test setup." 2016-11-16 02:17:57 +00:00
Daichi Hirono
976e63bdd3 Use StartFuseBridgeLoop function instead of FuseBridgeLoop class. 
The method is being renamed from FuseBridgeLoop::Start to StartFuseBridgeLoop
in libappfuse. The CL handles the change in the framework side.

Bug: 29970149
Test: None
Change-Id: I70b91e426fa817d84c7f1f5f24c9e3ba401e523b
 2016-11-16 10:12:37 +09:00
Jeff Sharkey
13deeafe46 Treat everyone the same, redux. 
Test: builds
Bug: 29746499
Change-Id: Id2a9aacf0db40cdd053d203897e792662c6d3cd0
 2016-11-16 01:12:13 +00:00
Jeff Sharkey
a3a43b09fe Fix copypasta error. 
Test: builds
Bug: 29087651
Change-Id: I99813278bc37fa332730144f821b33ae6bd35650
 2016-11-15 17:54:23 -07:00
Android Build Merger (Role)
3bda498b3f Merge "Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf am: afb8f37711 am: 2e73b06f63 am: 0fc7044d0b" 2016-11-16 00:45:35 +00:00
Peter Qiu
1556340f9a Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf am: afb8f37711 am: 2e73b06f63 
am: 0fc7044d0b

Change-Id: Ie42a4361d51ee489edc1357063516509cacddc0f
 2016-11-16 00:44:34 +00:00
Android Build Merger (Role)
06d202d3dd Merge changes from topic 'am-a57c7c884e184332ab6ba25437abb1a5' 
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 am: 134706940b am: 03e4bc1ead
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d am: 31b8e658d3 am: 996986254f
 2016-11-16 00:44:06 +00:00
Peter Qiu
c6d760ba1e wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 am: 134706940b 
am: 03e4bc1ead

Change-Id: Ia56fb25083513ff82cda7f66f5617d02b81e96ec
 2016-11-16 00:42:16 +00:00
Peter Qiu
35d842ef22 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d am: 31b8e658d3 
am: 996986254f

Change-Id: I647413dfcfd9dc769c484a4fa7e7eae13c66e0a0
 2016-11-16 00:41:13 +00:00
Jorim Jaggi
3c9006d842 Merge "Fix that window was not hidden after policy hiding animation" 2016-11-16 00:40:53 +00:00
Svetoslav Ganov
63ff0d822b Merge "Temporary enable Build#SERIAL" 2016-11-16 00:33:16 +00:00
Peter Qiu
0fc7044d0b Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf am: afb8f37711 
am: 2e73b06f63

Change-Id: I0be82ec64a61f015a34ded70202c422e43825778
 2016-11-16 00:29:39 +00:00
Svet Ganov
b5e603f270 Temporary enable Build#SERIAL 
Filed STOPSHIP b/32918547

bug:31803186

Change-Id: I66b26e5948d19391513e007daad099f51cb64155
 2016-11-15 16:29:38 -08:00
Peter Qiu
03e4bc1ead wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 am: 1b39c61ce7 
am: 134706940b

Change-Id: If04a8f9005b69b9f4f38c2e0ea38b7bc6162397e
 2016-11-16 00:27:34 +00:00
Peter Qiu
996986254f wifi: remove hidden unused Hotspot 2.0 Release 2 APIs am: a38558b539 am: a9a9a9bb8d 
am: 31b8e658d3

Change-Id: Ifce7abfb578e5b7d0a3d5c964926537e16ef3a2b
 2016-11-16 00:26:28 +00:00
Peter Qiu
2e73b06f63 Merge changes from topic 'HS2 API Cleanup' am: 41fd0f1faf 
am: afb8f37711

Change-Id: I413a4e86233f103767c24b636212faf3fba3dcf9
 2016-11-16 00:18:36 +00:00
Peter Qiu
134706940b wifi: remove unused hidden Hotspot 2.0 Release 1 API am: 1c3054ea87 
am: 1b39c61ce7

Change-Id: Ia81a0d8b77a6031670b89f97d21fc29be9631fb3
 2016-11-16 00:16:30 +00:00