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

412886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
a004c6c69b [automerger skipped] Merge "Fix enumerate corner case" into qt-dev am: 442a4e7b16 
am: 538ced2cc6 -s ours
am skip reason: change_id I766cc04be151abaae60a0092f71fd7a3acf3397a with SHA1 ea80d17cb6 is in history

Change-Id: Ia4955bd730b8011f609aa9f05633fcc886e987d3
 2019-04-04 22:17:18 -07:00
Kevin Chyn
1ac8b9d575 [automerger skipped] Merge "Update BiometricPrompt default title" into qt-dev am: c301e0393c 
am: 6d1f8d5dbe -s ours
am skip reason: change_id I3b82396694a26d63a79334e7e86c4e9121a370f6 with SHA1 87fbeab12f is in history

Change-Id: I284ec26a81f9ac5e24e5dd03a84e633a19a5a820
 2019-04-04 22:08:08 -07:00
John Reck
4ef664a3e6 Merge "Add back render-ahead support" into qt-dev am: 22477c4dd0 
am: 3e1d6fdc4a

Change-Id: I528633caec1c90886174dce216bc36f70ad267a0
 2019-04-04 21:58:20 -07:00
Kevin Chyn
538ced2cc6 Merge "Fix enumerate corner case" into qt-dev 
am: 442a4e7b16

Change-Id: I439fdd7f2c4977f50a68d860a071542d192e3a36
 2019-04-04 21:53:38 -07:00
John Reck
402cc87779 Merge "Add draw props back to greylist" into qt-dev am: 410d783f5b 
am: e84938418c

Change-Id: I6032f7eb9e488b8711bc6424f9998f3e9dd46902
 2019-04-04 21:45:31 -07:00
Kevin Chyn
6d1f8d5dbe Merge "Update BiometricPrompt default title" into qt-dev 
am: c301e0393c

Change-Id: I5d422fa2a00f59ac8041fecba6c38bbd236d9aea
 2019-04-04 21:45:21 -07:00
Jack Yu
9633180b35 Merge "Improved the debug message" into qt-dev am: f7d42f12b8 
am: 199ba53534

Change-Id: I89aefe5fdda44d094f7139b2910956d0d0fe8c4c
 2019-04-04 21:32:28 -07:00
Kevin Chyn
442a4e7b16 Merge "Fix enumerate corner case" into qt-dev 2019-04-05 04:24:04 +00:00
John Reck
3e1d6fdc4a Merge "Add back render-ahead support" into qt-dev 
am: 22477c4dd0

Change-Id: I0d181075056adccdb1e5d7884ac075dcfd0ee1b8
 2019-04-04 21:23:44 -07:00
Kevin Chyn
c301e0393c Merge "Update BiometricPrompt default title" into qt-dev 2019-04-05 04:23:27 +00:00
Joshua Tsuji
1eec7c0163 Merge "Adjust the physics params to values decided on in meeting w/ design." into qt-dev am: 242522bf8b 
am: 117dbbfd3d

Change-Id: I328d36c6a1ca0f8bfa32cc6fcab69980107f2bdf
 2019-04-04 21:12:20 -07:00
TreeHugger Robot
22477c4dd0 Merge "Add back render-ahead support" into qt-dev 2019-04-05 03:57:37 +00:00
Lyn Han
bbd95adf4c Merge "Update shape for all bubbles" into qt-dev am: 7fddea0e29 
am: 4cd19d4058

Change-Id: I608fb6561b4a98ba408f1d8d37d3d43f54ccf60e
 2019-04-04 20:52:33 -07:00
John Reck
e84938418c Merge "Add draw props back to greylist" into qt-dev 
am: 410d783f5b

Change-Id: Ib40d873ddf6da64901e097baf812aca20c849684
 2019-04-04 20:52:32 -07:00
Jack Yu
199ba53534 Merge "Improved the debug message" into qt-dev 
am: f7d42f12b8

Change-Id: I04a9f28eb70918bb60f2d487fe1051dc2c714159
 2019-04-04 20:39:25 -07:00
Torne (Richard Coles)
c70b725bf4 Merge "Allow the WebView native library to have dependencies." into qt-dev am: ec2d399a9e 
am: 2f8faeb717

Change-Id: I9be84a08c5856511627786a2d18059e18f682b69
 2019-04-04 20:34:51 -07:00
TreeHugger Robot
410d783f5b Merge "Add draw props back to greylist" into qt-dev 2019-04-05 03:30:48 +00:00
Salvador Martinez
530444f842 Merge "Fix mixed up variable in triggering logic" into qt-dev am: 0139ae1581 
am: 58014ecc56

Change-Id: I86235afad332329f3aa0787f9f0d0438941cbda5
 2019-04-04 20:28:29 -07:00
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
Jack Yu
f7d42f12b8 Merge "Improved the debug message" into qt-dev 2019-04-05 03:17:40 +00:00
Jack Yu
0c92c23951 Improved the debug message 
Improved the log readability by printed out data state
in string format instead of integer. Also added listen
local log.

Bug: 129631771
Test: Manual
Change-Id: If786d51b35380f606bc388e29a441bb24a2792e0
 2019-04-05 03:17:05 +00:00
Joshua Tsuji
117dbbfd3d Merge "Adjust the physics params to values decided on in meeting w/ design." into qt-dev 
am: 242522bf8b

Change-Id: I63037f696b593ef4fd4f30e04ccf0aaef3714393
 2019-04-04 20:10:42 -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
Lyn Han
4cd19d4058 Merge "Update shape for all bubbles" into qt-dev 
am: 7fddea0e29

Change-Id: Iba31c97cee184c1156d91f34dcb5654fe0966524
 2019-04-04 20:03:51 -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
TreeHugger Robot
242522bf8b Merge "Adjust the physics params to values decided on in meeting w/ design." into qt-dev 2019-04-05 02:42:44 +00: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
TreeHugger Robot
7fddea0e29 Merge "Update shape for all bubbles" into qt-dev 2019-04-05 02:41:01 +00:00
Torne (Richard Coles)
2f8faeb717 Merge "Allow the WebView native library to have dependencies." into qt-dev 
am: ec2d399a9e

Change-Id: I4c4428734ff613c262409f9c5a19d4c716b373d7
 2019-04-04 19:33:34 -07:00
Salvador Martinez
58014ecc56 Merge "Fix mixed up variable in triggering logic" into qt-dev 
am: 0139ae1581

Change-Id: I9c3ab49350cd3a569d2ac80ffa48e89948ec3822
 2019-04-04 19:16:23 -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
TreeHugger Robot
ec2d399a9e Merge "Allow the WebView native library to have dependencies." into qt-dev 2019-04-05 01:23:37 +00: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
TreeHugger Robot
0139ae1581 Merge "Fix mixed up variable in triggering logic" into qt-dev 2019-04-05 01:00:22 +00: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