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

319277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Carr
dff4323f01 Merge "Preserve non-floating state when entering pinned stack." into oc-dev 
am: f5b6818009

Change-Id: I22f408fef8007cb5c1266a7115da01c07b4f0eb4
 2017-05-15 23:38:21 +00:00
Kirill Grouchnikov
0eeaa4643c Merge "Tweak test app makefile with extra resources" into oc-dev 
am: 2b1df4ec14

Change-Id: I861ebd781bec4c41582c9a11f9cb79fb8982be18
 2017-05-15 23:26:16 +00:00
Rob Carr
f5b6818009 Merge "Preserve non-floating state when entering pinned stack." into oc-dev 2017-05-15 23:17:33 +00:00
Jesse Hall
4e99819ba6 Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev 
am: 40b274915e

Change-Id: I849c6a942448536b67d79f0687f07ed36567fa1b
 2017-05-15 23:15:04 +00:00
Kirill Grouchnikov
2b1df4ec14 Merge "Tweak test app makefile with extra resources" into oc-dev 2017-05-15 23:11:09 +00:00
TreeHugger Robot
40b274915e Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev 2017-05-15 23:02:05 +00:00
Android Build Merger (Role)
74714d0323 Merge "Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 am: 7e80c3f00b" into oc-dev-plus-aosp 2017-05-15 22:38:33 +00:00
Hall Liu
deeda1e353 Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 
am: 7e80c3f00b

Change-Id: Id3359056c247288825ec672963b538cfaa121937
 2017-05-15 22:35:04 +00:00
Wale Ogunwale
33c831a15c Merge "Changed alert window notifications to use single channel" into oc-dev 
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e
 2017-05-15 22:34:59 +00:00
TreeHugger Robot
648e127fcb Merge "Changed alert window notifications to use single channel" into oc-dev 2017-05-15 22:25:43 +00:00
Hall Liu
7e80c3f00b Merge "Change signalStrength to int." am: 73818566d6 
am: 762e0c1162

Change-Id: I5cf3c07071c57c362847133c8858227d58662ce8
 2017-05-15 22:25:34 +00:00
Hall Liu
762e0c1162 Merge "Change signalStrength to int." 
am: 73818566d6

Change-Id: I8a9afddc749afc216dc1dc16f0465df1d0dab24f
 2017-05-15 22:14:59 +00:00
Hall Liu
73818566d6 Merge "Change signalStrength to int." 2017-05-15 22:01:21 +00:00
Dmitry Dementyev
41b5c9441d Merge "Don't request account access for apps if it is explictly made not visible to them." into oc-dev 
am: 1827f12b50

Change-Id: I08cd9dee656ace131770214eef2f8667a5b8163a
 2017-05-15 21:24:04 +00:00
Evan Rosky
6c16bc5711 Merge "Post setSwitchingUser to main thread" into oc-dev 
am: 775699dc05

Change-Id: If7fcaf4209f0ea1ff31030bffad87c7a343c142b
 2017-05-15 21:12:19 +00:00
Jesse Hall
0e72f130ab Require targetSdkVersion>=O for updated graphics driver packages 
In O, graphics drivers are loaded into a new restricted linker
namespace. Drivers built for previous versions of the OS may not work
under those restrictions, so require an updated driver package to
declare compatibility by setting targetSdkVersion >= O.

Bug: 34228255
Test: manually construct packages with and without
      targetSdkVersion >= O, confirm driver is used/not-used as
      expected.
Change-Id: I4518360433a6de5c6e1e792a6eedddf8c6bf4394
 2017-05-15 14:08:57 -07:00
TreeHugger Robot
1827f12b50 Merge "Don't request account access for apps if it is explictly made not visible to them." into oc-dev 2017-05-15 21:07:40 +00:00
Kevin Chyn
530658fc86 Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing" into oc-dev 
am: 4be9b2ca3e

Change-Id: Icc4dcc08a2cc62872ae1b017ebf5c724a7003336
 2017-05-15 21:04:59 +00:00
Hall Liu
7780b9bced Merge "Remove switchStreams API." am: f465d84ebe am: 48941f5d90 
am: 3b867ed0b3

Change-Id: Id3ff5e2609d4acd2226f6717745951f704f1e6b2
 2017-05-15 21:00:33 +00:00
Hall Liu
3b867ed0b3 Merge "Remove switchStreams API." am: f465d84ebe 
am: 48941f5d90

Change-Id: I739d0f707c60167cf99e1ca5126621a899e607d7
 2017-05-15 20:54:30 +00:00
Evan Rosky
775699dc05 Merge "Post setSwitchingUser to main thread" into oc-dev 2017-05-15 20:52:45 +00:00
TreeHugger Robot
4be9b2ca3e Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing" into oc-dev 2017-05-15 20:52:28 +00:00
Hall Liu
48941f5d90 Merge "Remove switchStreams API." 
am: f465d84ebe

Change-Id: Ia2cd7338087ee5283d2241ec260d0649ccd3f2b2
 2017-05-15 20:41:45 +00:00
Hall Liu
f465d84ebe Merge "Remove switchStreams API." 2017-05-15 20:22:57 +00:00
Geoffrey Pitsch
b07f6932bf Merge "Center switch vertically with primary text" into oc-dev 
am: 4b2cecbb53

Change-Id: I07e16d38defe17b09d24bb8f19994564773e0540
 2017-05-15 20:17:55 +00:00
TreeHugger Robot
4b2cecbb53 Merge "Center switch vertically with primary text" into oc-dev 2017-05-15 20:11:04 +00:00
Wale Ogunwale
8f7bebca36 Changed alert window notifications to use single channel 
Per UX request.

Change-Id: Iefe1be52743519af5ee1481b59613c87f16bdf7d
Fixes: 37422870
Test: Verify alert window notification channel.
 2017-05-15 13:08:23 -07:00
Jeff Tinker
8b1e0e1254 Merge "Fix drm hal resource leaks" into oc-dev 
am: 63398bbd71

Change-Id: Iae4c7f407e638dd2dba5acfc43a3ca894f665bd4
 2017-05-15 20:03:16 +00:00
TreeHugger Robot
63398bbd71 Merge "Fix drm hal resource leaks" into oc-dev 2017-05-15 19:54:15 +00:00
Winson Chung
1b7f4b3ce2 Merge "Ensure that we check against the pending state while suspended." into oc-dev 
am: 70a8e86918

Change-Id: Iadf91f728260c235255a79871e6a5f9d3b884de2
 2017-05-15 19:41:59 +00:00
Winson Chung
70a8e86918 Merge "Ensure that we check against the pending state while suspended." into oc-dev 2017-05-15 19:31:13 +00:00
Paul Duffin
e80496e351 Merge "Moved c.a.i.u.Predicate[s] into legacy-test" am: e476a30575 am: 3215c85de9 
am: 19e2a75bf0  -s ours

Change-Id: Icb146259935a138dc45b91c0f023035aed72cb5a
 2017-05-15 19:28:08 +00:00
Paul Duffin
19e2a75bf0 Merge "Moved c.a.i.u.Predicate[s] into legacy-test" am: e476a30575 
am: 3215c85de9

Change-Id: Ib64efa0332d5f5bdbab99f3271bc058c54bfaa35
 2017-05-15 19:19:30 +00:00
Paul Duffin
3215c85de9 Merge "Moved c.a.i.u.Predicate[s] into legacy-test" 
am: e476a30575

Change-Id: Ia0b3ebd30e045fe2b26fe9a78b2de665bf960b0c
 2017-05-15 19:11:08 +00:00
Paul Duffin
e476a30575 Merge "Moved c.a.i.u.Predicate[s] into legacy-test" 2017-05-15 18:58:47 +00:00
Kevin Chyn
6db7d5fc84 Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing 
There's a race condition if user unlocks from bouncer and an app underneath
uses FP does onResume()

If a user has an application that's authenticating via FP underneath
keyguard and the user dismisses keyguard via bouncer, the app underneath
will get kicked out since onKeyguardVisibilityChanged(false) calls
shouldListenForFingerprint() during this race.

Keyguard shouldn't listen to FP if bouncer is showing but keyguard is
dismissing

Fixes: 37967985
Test: 1) open FP settings
2) enter keyguard and go to bouncer
3) unlock keyguard via pin/pattern/password (NON FP method)
4) tap any finger on sensor (should vibrate)

Merged-In: Ie38d55e6a1ec9b49f9df0c7520d0bc451315c161
Change-Id: Ie38d55e6a1ec9b49f9df0c7520d0bc451315c161
 2017-05-15 18:11:23 +00:00
Amith Yamasani
5cd7bd118e Merge "Map isolated processes to correct uid" into oc-dev 
am: ba4ac09d23

Change-Id: I44e106b59854a12d8f871cbf595574a4b345dd4a
 2017-05-15 17:44:46 +00:00
Hyunyoung Song
d3790e9dfa Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev 
am: 10abacf3f3

Change-Id: I1872725e46ac5ccf9f51d2a0818a93d55a094d01
 2017-05-15 17:41:38 +00:00
Amith Yamasani
ba4ac09d23 Merge "Map isolated processes to correct uid" into oc-dev 2017-05-15 17:36:36 +00:00
Hyunyoung Song
10abacf3f3 Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev 2017-05-15 17:36:16 +00:00
Hyunyoung Song
8947f59f96 Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts) 
b/38304824
Test: cts tests in ag/2262246 and also full build and tried the system image.

Change-Id: I8f021aa2bb1a0e99597bc00064ab1e9d85569bcb
 2017-05-15 17:31:13 +00:00
Evan Rosky
4e44fcedad Post setSwitchingUser to main thread 
touching view hierarchy should only occur on UI thread

Bug: 37167272
Test: keyguard still works, used Log to see that switching
      still gets called
Change-Id: I45ed9894a8f08c38da40de44f84e99cddb683014
 2017-05-15 10:21:15 -07:00
Ying Xu
061a71a0b4 Merge "Add API to support async network scans." am: 625d5a9dd9 am: 8d692eb811 
am: 31aff5459b

Change-Id: I416017e17a3e1cd837541440ef0ac44c5184dad2
 2017-05-15 17:20:58 +00:00
Ying Xu
31aff5459b Merge "Add API to support async network scans." am: 625d5a9dd9 
am: 8d692eb811

Change-Id: I0aef12a6d1617b594cd1ed050ed0a02043ae5aba
 2017-05-15 17:12:59 +00:00
Phil Weaver
6f40533f4e Merge "Add null check to a11y call." into oc-dev 
am: 9289faa163

Change-Id: I9e9232a1cef8cd29909233995e983eda98872568
 2017-05-15 17:05:31 +00:00
Ying Xu
8d692eb811 Merge "Add API to support async network scans." 
am: 625d5a9dd9

Change-Id: Iac369e26f707e59095ae7a89bfb11324e12634dc
 2017-05-15 17:04:43 +00:00
Ying Xu
625d5a9dd9 Merge "Add API to support async network scans." 2017-05-15 16:57:07 +00:00
Phil Weaver
9289faa163 Merge "Add null check to a11y call." into oc-dev 2017-05-15 16:56:29 +00:00
Sumir Kataria
3912511db2 Merge "Use placeholderCount-1 if using default layout." into oc-dev 
am: 260d6c6e8c

Change-Id: Ie4ec53faee984a427e4e175255794a668e02b2a6
 2017-05-15 16:45:57 +00:00
Sumir Kataria
260d6c6e8c Merge "Use placeholderCount-1 if using default layout." into oc-dev 2017-05-15 16:35:32 +00:00