Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
412,850 Commits 3 Branches 0 Tags
887ef6abecda640c5fda5e6347700f95ea3d48ff
Commit Graph

412850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
887ef6abec Merge "notifyEnabledOnKeyguardCallbacks when user switches" into qt-dev am: dcfe0d338b 
am: e8e3ea329e

Change-Id: I471dab64191cddb7b5548e85f3825ebaef5ebf89
 2019-04-04 20:21:44 -07:00
Kevin Chyn
3a5377328d Merge changes from topic "face-profile-qt-dev" into qt-dev am: b4863267a7 
am: b9b6761576

Change-Id: I612a27258c6a7d63488542a20077bd50e8e42f7e
 2019-04-04 20:08:01 -07:00
Jack He
d322764235 Merge "Rename BluetoothManufacturerInfoReported to BluetoothDeviceInfoReported" into qt-dev am: 3553de0d7d 
am: 0240f0f5c3

Change-Id: I5b848355fc84c528ab7899816fa994727e3f43be
 2019-04-04 19:58:23 -07:00
Tyler Gunn
7dd9ef2bdc Merge "Merge "Add @hide API to get the phone account handle for a subId." am: f910aa4e60 am: f31c79bef4" into qt-dev-plus-aosp 
am: 3f6736317c

Change-Id: Ib1cb39723ba507425453587fece194136de2aaab
 2019-04-04 19:41:13 -07:00
Shuzhen Wang
08e8b1564b Merge "Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev am: cbf999bd4f" into qt-dev-plus-aosp 
am: 1c1e4a6293

Change-Id: I0cdbd29ca3c2e9dd048ec6adb5078e75e22bd595
 2019-04-04 19:15:03 -07:00
Kevin Chyn
e8e3ea329e Merge "notifyEnabledOnKeyguardCallbacks when user switches" into qt-dev 
am: dcfe0d338b

Change-Id: I6dd1196a5ca542da04f8917e10c8c3d2e74fc812
 2019-04-04 19:01:17 -07:00
Sasha Smundak
574dce2f64 [automerger skipped] Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" am: 2e96d3f554 am: 8b788b2194 -s ours 
am: b37e639872 -s ours
am skip reason: change_id If3f574bc15dedcd7880be605667297d257175c8d with SHA1 89eaa93af9 is in history

Change-Id: Id9578c9576d6eeb886cce16a78d4d60769787528
 2019-04-04 18:56:43 -07:00
Kevin Chyn
b9b6761576 Merge changes from topic "face-profile-qt-dev" into qt-dev 
am: b4863267a7

Change-Id: I7ca6a2830058dfc46ec0ff7ce2c547c1d3baadb6
 2019-04-04 18:49:29 -07:00
Jack He
0240f0f5c3 Merge "Rename BluetoothManufacturerInfoReported to BluetoothDeviceInfoReported" into qt-dev 
am: 3553de0d7d

Change-Id: I4ac8c90b9d5536aa0d571983606d5c00ec6f36fe
 2019-04-04 18:28:29 -07:00
Wonsik Kim
8c3c0e8c5c Merge "media: fix documentation for MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES" into qt-dev am: f04a40a607 
am: d80730f559

Change-Id: Id2d827bf43d5c5f98fbc5a9c1b86394998325fb9
 2019-04-04 18:26:10 -07:00
Makoto Onuki
8ca4b295ae Merge "Change ISE to AssertException, which is more suitable." into qt-dev am: 5e7b4175b7 
am: 79f6fbe6f6

Change-Id: Iade9fbc3937f6d3cb92b6a3733c5575604f012df
 2019-04-04 18:19:19 -07:00
Roshan Pius
33dda1d500 Merge "WifiManager: Restore network pin behavior on enableNetwork" into qt-dev am: 8d3cb6b3fd 
am: 183edc9565

Change-Id: Ibc188daa489f6b1ced4d5b7813df5a0b30133546
 2019-04-04 18:13:53 -07:00
Android Build Merger (Role)
3f6736317c Merge "Merge "Add @hide API to get the phone account handle for a subId." am: f910aa4e60 am: f31c79bef4" into qt-dev-plus-aosp 2019-04-05 01:08:07 +00:00
Android Build Merger (Role)
1c1e4a6293 Merge "Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev am: cbf999bd4f" into qt-dev-plus-aosp 2019-04-05 01:07:27 +00:00
Tyler Gunn
efed414b33 Merge "Add @hide API to get the phone account handle for a subId." am: f910aa4e60 
am: f31c79bef4

Change-Id: I1c71f82b94c15b61e1aac0c8f84703b80ef3c412
 2019-04-04 18:06:17 -07:00
Shuzhen Wang
350b4d5066 Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev 
am: cbf999bd4f

Change-Id: If86c0a60b797e5b17253c31c9c98d3da71f29089
 2019-04-04 18:05:37 -07:00
Sasha Smundak
b37e639872 [automerger skipped] Merge "Convert core/tests/featureflagtests/Android.mk file to Android.bp" am: 2e96d3f554 
am: 8b788b2194 -s ours
am skip reason: change_id If3f574bc15dedcd7880be605667297d257175c8d with SHA1 89eaa93af9 is in history

Change-Id: I066c4422eb1ae87f0e5943063201466756b3891e
 2019-04-04 17:56:35 -07:00
Kevin Chyn
dcfe0d338b Merge "notifyEnabledOnKeyguardCallbacks when user switches" into qt-dev 2019-04-05 00:44:01 +00:00
Wonsik Kim
d80730f559 Merge "media: fix documentation for MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES" into qt-dev 
am: f04a40a607

Change-Id: I1f6aa39dc990783df5fc425f4919bafeb401beb0
 2019-04-04 17:42:24 -07:00
Kevin Chyn
b4863267a7 Merge changes from topic "face-profile-qt-dev" into qt-dev 
* changes:
  Enroll for the correct user
  Do not updateActiveGroup on a handler
  Launch ConfirmDeviceCredential with actual userId
  Settings should be per-profile
 2019-04-05 00:41:17 +00:00
TreeHugger Robot
3553de0d7d Merge "Rename BluetoothManufacturerInfoReported to BluetoothDeviceInfoReported" into qt-dev 2019-04-05 00:40:36 +00:00
Ben Murdoch
7e360c149b Merge "Fixup App Compaction CL nits." into qt-dev am: 393ba51cbd 
am: d7fcac064b

Change-Id: I015ac31cfa54a5a9c5a573ce29a77aa5b8bec1bf
 2019-04-04 17:37:40 -07:00
Makoto Onuki
79f6fbe6f6 Merge "Change ISE to AssertException, which is more suitable." into qt-dev 
am: 5e7b4175b7

Change-Id: Icbee6bef0924b2abcafa7834b739290b2360d10e
 2019-04-04 17:35:30 -07:00
Roshan Pius
183edc9565 Merge "WifiManager: Restore network pin behavior on enableNetwork" into qt-dev 
am: 8d3cb6b3fd

Change-Id: I24ef25f4b3cd7d8cfb307392ebc2d86005a0b10b
 2019-04-04 17:29:14 -07:00
Ben Murdoch
d7fcac064b Merge "Fixup App Compaction CL nits." into qt-dev 
am: 393ba51cbd

Change-Id: Ib4454434482b95a571fec83f0ed33b375686f2f5
 2019-04-04 17:21:47 -07:00
Beverly
6f29cf54d3 Merge "Don't show dnd suppressed icons on aod" into qt-dev am: 67fd7ad761 
am: 8a356a70bf

Change-Id: I6cc0a4dedcc31843dc9e81ca7bfaf23d343a2522
 2019-04-04 17:13:33 -07:00
TreeHugger Robot
cbf999bd4f Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev 2019-04-05 00:13:29 +00:00
Wonsik Kim
f04a40a607 Merge "media: fix documentation for MediaFormat.KEY_PREPEND_HEADERS_TO_SYNC_FRAMES" into qt-dev 2019-04-05 00:05:02 +00:00
Makoto Onuki
5e7b4175b7 Merge "Change ISE to AssertException, which is more suitable." into qt-dev 2019-04-04 23:56:29 +00:00
TreeHugger Robot
8d3cb6b3fd Merge "WifiManager: Restore network pin behavior on enableNetwork" into qt-dev 2019-04-04 23:54:13 +00:00
Beverly
8a356a70bf Merge "Don't show dnd suppressed icons on aod" into qt-dev 
am: 67fd7ad761

Change-Id: Ie216a6e499d25c8299cd0388565083ce54bd4d66
 2019-04-04 16:53:34 -07:00
Yohei Yukawa
363c10a94c Merge "Introduce a result class for IStatusBarService#registerStatusBar()" into qt-dev am: fd33fe0e8a 
am: 1b3ebb831f

Change-Id: I8551eec0d76f793f69afd72a2378dc495eb09fee
 2019-04-04 16:49:49 -07:00
TreeHugger Robot
393ba51cbd Merge "Fixup App Compaction CL nits." into qt-dev 2019-04-04 23:43:30 +00:00
TreeHugger Robot
67fd7ad761 Merge "Don't show dnd suppressed icons on aod" into qt-dev 2019-04-04 23:42:57 +00:00
Amin Shaikh
cee912e368 Merge "Update systemui wifi icons to GM2." into qt-dev am: f8b98bb10d 
am: d3b63bc4bf

Change-Id: I0b4b541ee2b9b44910403ccfc1c13f2bee6b03e0
 2019-04-04 16:38:44 -07:00
Yohei Yukawa
1b3ebb831f Merge "Introduce a result class for IStatusBarService#registerStatusBar()" into qt-dev 
am: fd33fe0e8a

Change-Id: Ie3a5bb4d0a5a0ed7956767fc777509ec69695330
 2019-04-04 16:38:29 -07:00
TreeHugger Robot
6c1305ef7a Merge "Revert "Set system gesture exclusion rects for Bubbles"" 2019-04-04 23:33:12 +00:00
Amin Shaikh
d3b63bc4bf Merge "Update systemui wifi icons to GM2." into qt-dev 
am: f8b98bb10d

Change-Id: I78f788c6a1bc34fe77d34dd2f716ae39fb7ba2b0
 2019-04-04 16:28:48 -07:00
TreeHugger Robot
fd33fe0e8a Merge "Introduce a result class for IStatusBarService#registerStatusBar()" into qt-dev 2019-04-04 23:22:55 +00:00
Amith Yamasani
ee7fdd2e18 Merge "Fix for NetworkStats/Telephony deadlock" into qt-dev am: fcc3c44d88 
am: 25d80e7b5c

Change-Id: Ie16a24390bce23a22b63975fb0bcecfac7990779
 2019-04-04 16:12:05 -07:00
TreeHugger Robot
f8b98bb10d Merge "Update systemui wifi icons to GM2." into qt-dev 2019-04-04 23:10:28 +00:00
Amith Yamasani
25d80e7b5c Merge "Fix for NetworkStats/Telephony deadlock" into qt-dev 
am: fcc3c44d88

Change-Id: I860f53f63df73291bb5be40668e4e4729597f933
 2019-04-04 16:03:13 -07:00
Kevin Chyn
0c00033d4b notifyEnabledOnKeyguardCallbacks when user switches 
The setting is per-user and the source of truth is in BiometricService.
Keyguard's cache needs to be updated when user switch occurs

Fixes: 5268106

Test: Builds
Change-Id: I8a5678375989221e5b502fa683697cf4ca664def
 2019-04-04 16:02:37 -07:00
Kevin Chyn
1a878c1fba Enroll for the correct user 
Bug: 110907543

Test: Builds
Change-Id: I637809cd18d84402918c95d1fc010dacc14f8785
 2019-04-04 15:50:11 -07:00
TreeHugger Robot
fcc3c44d88 Merge "Fix for NetworkStats/Telephony deadlock" into qt-dev 2019-04-04 22:48:01 +00:00
Jack He
aea2698771 Rename BluetoothManufacturerInfoReported to BluetoothDeviceInfoReported 
* Rename this atom to match the atom's field name

Bug: 112969790
Test: make
Change-Id: Idb54766703f47a5eb6cd7f0cdff1c41e1a92cfb1
 2019-04-04 22:38:18 +00:00
Keun young Park
2a770c07a0 Test flaky test: Always wait for handle task to complete am: e320cdb441 
am: 41b2ea6471

Change-Id: Ic723abe53cd4bc834f5485f63594a3b49a038369
 2019-04-04 15:00:23 -07:00
Keun young Park
41b2ea6471 Test flaky test: Always wait for handle task to complete 
am: e320cdb441

Change-Id: I18fdc1648a3b313c75dc0f2f5a7198e18c56b69d
 2019-04-04 14:49:43 -07:00
TreeHugger Robot
73f3f665f7 Merge "Fix issue #129936402: Runtime restart occurs when suspending an app..." 2019-04-04 21:43:35 +00:00
Mark Renouf
f4c212b99c Revert "Set system gesture exclusion rects for Bubbles" 
Test: this is a revert
This reverts commit ea111fa8ce.

Change-Id: I7581bd69e39ec0ab9a7775b7c347dd27eb652798
 2019-04-04 17:14:47 -04:00