Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
625,076 Commits 3 Branches 0 Tags
8d7caa8afabfe3ac21385abb770f1b41acc2c4e5
Commit Graph

625076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
8d7caa8afa Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 am: 1c691ff753 am: a4e94c8b2c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac0f9a52b6a36657845b289df3a254b870d287cc
 2021-02-19 23:38:48 +00:00
Makoto Onuki
a4e94c8b2c Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 am: 1c691ff753 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5ce8805a0d414a60958a83978dca5ce2598dd64
 2021-02-19 22:59:57 +00:00
Chloris Kuo
f8cc3c16d8 Merge "NAS Feedback API Change" into sc-dev 2021-02-19 22:41:40 +00:00
Makoto Onuki
1c691ff753 Merge "Add a missing NULL check for postActivityStartTokenRemoval()" am: 5fea1d9a01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8860761993c9a4b9ebb45c8d3f54d58b205926e4
 2021-02-19 22:34:46 +00:00
Fan Zhang
45cbe9b7fc Merge "Update emergency number authority name to be more generic" into sc-dev 2021-02-19 21:59:16 +00:00
Jeff DeCew
42a0d2efd1 Merge "Use android:clipToOutline in notification templates." into sc-dev 2021-02-19 21:27:56 +00:00
Bill Yi
6a0f8b2bf0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-19 21:15:10 +00:00
Makoto Onuki
5fea1d9a01 Merge "Add a missing NULL check for postActivityStartTokenRemoval()" 2021-02-19 21:08:30 +00:00
TreeHugger Robot
4d4817a9b3 Merge changes from topic "revert-13593269-QAPPBSWOVZ" into sc-dev 
* changes:
  Revert "Update RemovalClient to support new biometric AIDL"
  Revert "Try to ensure tests run sequentially"
 2021-02-19 21:07:47 +00:00
Ilya Matyukhin
4ca4f15979 Merge "Update IFingerprint TestHal with close and reset methods" into sc-dev 2021-02-19 21:04:24 +00:00
Ilya Matyukhin
98fbf435b8 Merge "Update IFace TestHal with close and reset methods" into sc-dev 2021-02-19 21:02:00 +00:00
Brad Ebinger
14c72817c1 Merge "Integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" into sc-dev 2021-02-19 19:36:06 +00:00
TreeHugger Robot
7330bd4e8c Merge "Cache locations of where nearest child is." into sc-dev 2021-02-19 19:34:53 +00:00
Jeff Sharkey
792ba79a87 Merge "Add OWNERS for palette library" am: 2a1600625c am: 43ae72c0f2 am: e7280d82d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d5e8a2e59a7a4619a284ac15e004e73e9f291af
 2021-02-19 19:20:23 +00:00
Anthony Stange
e9681f3bbb Merge "Add owners for files related to the sensors framework" am: 5927064796 am: 16d6248bc6 am: a04505c12e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3220b76d3417cee41a6a63ffc86082a8638142b6
 2021-02-19 19:19:47 +00:00
Jeff Sharkey
e7280d82d6 Merge "Add OWNERS for palette library" am: 2a1600625c am: 43ae72c0f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c3112d0c50c4f26b73db77ac4a6e02553466d61
 2021-02-19 19:15:46 +00:00
Guojing Yuan
bade294311 Merge "Provide an example for FLAG_PERMISSION_SELECTED_LOCATION_ACCURACY" into sc-dev 2021-02-19 19:10:25 +00:00
Daniel Chapin
62e2c705c5 Revert "Update RemovalClient to support new biometric AIDL" 
Revert submission 13593269

Reason for revert: Bug: 180689674
Reverted Changes:
I59f6e607f:Update RemovalClient to support new biometric AIDL...
I3fdb3fe0b:Try to ensure tests run sequentially

Change-Id: I939172f2961f3f2c9f8eddd59261f75552eeb31f
 2021-02-19 19:10:04 +00:00
Daniel Chapin
c0dd229fc6 Revert "Try to ensure tests run sequentially" 
Revert submission 13593269

Reason for revert: Bug: 180689674
Reverted Changes:
I59f6e607f:Update RemovalClient to support new biometric AIDL...
I3fdb3fe0b:Try to ensure tests run sequentially

Change-Id: Ia9c02759db7238536e21dd05f8e247a91e9ac5aa
 2021-02-19 19:10:04 +00:00
Chris Li
21dad1954c Merge "Fix non-zero window inset" into sc-dev 2021-02-19 19:02:32 +00:00
Anthony Stange
a04505c12e Merge "Add owners for files related to the sensors framework" am: 5927064796 am: 16d6248bc6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24ab3a9bc3556fbdfe97287508dc4f539fa071f4
 2021-02-19 18:58:31 +00:00
Jeff Sharkey
43ae72c0f2 Merge "Add OWNERS for palette library" am: 2a1600625c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c2c1e14f8190bf5dcec235a945657190ea55979
 2021-02-19 18:57:27 +00:00
Anthony Stange
16d6248bc6 Merge "Add owners for files related to the sensors framework" am: 5927064796 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5304037bbbd87f7e0bd7d0b2c337239ac782725
 2021-02-19 18:20:56 +00:00
Bill Yi
6844338efb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-19 18:12:05 +00:00
Bill Yi
c9435cfc6b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-19 18:09:49 +00:00
Bill Yi
a8145366f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-19 18:09:42 +00:00
Bill Yi
f49c6a7911 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-19 18:09:35 +00:00
Bill Yi
3789c4982c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-19 18:09:27 +00:00
Jeff Sharkey
2a1600625c Merge "Add OWNERS for palette library" 2021-02-19 18:07:34 +00:00
Jeff DeCew
a1e1249eae Use android:clipToOutline in notification templates. 
Test: manual
Fixes: 180597172
Change-Id: Ifd7774a096e5d7204ebbcf00039fcabc77ed1535
 2021-02-19 18:07:27 +00:00
Jeff DeCew
7f9a369d63 Merge changes from topic "phishing_templates" into sc-dev 
* changes:
  Refactor the SmartReply classes
  Filter out RemoteInput actions when Phishing action is present
 2021-02-19 18:06:33 +00:00
James O'Leary
2964b50d79 Add OWNERS for palette library 
- dupin@ landed the folder & code in it originally
- good idea to move review off the plates of generic frameworks/base
OWNERS

Change-Id: I03a1e8ec00d5b658ee026a44038703e5b31ca52e
 2021-02-19 18:04:06 +00:00
Eric Laurent
d196216e13 Merge "AudioService: fix cross deadlock when accessing audio mode" into sc-dev 2021-02-19 17:34:50 +00:00
Anthony Stange
5927064796 Merge "Add owners for files related to the sensors framework" 2021-02-19 17:23:45 +00:00
Jay Aliomer
3c1756bbef Merge "Revert^2 "Wallpaper Local color sampling"" into sc-dev 2021-02-19 17:07:45 +00:00
Nataniel Borges
145b1a45c5 Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 7096deadf4 am: d88a8d2036 am: aa2b03ecea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d80ea1c572a3eec58a67b0d7c4faa79b30c206a
 2021-02-19 17:02:32 +00:00
Lorenzo Colitti
f9ebe077ff Merge "Delete VPN methods in ConnectivityManager." am: e8817c1796 am: 7e292e7920 am: adf1883cee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadf429549b60f96c471a29fb91f12ff340c94cb0
 2021-02-19 17:01:44 +00:00
Nataniel Borges
aa2b03ecea Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 7096deadf4 am: d88a8d2036 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice973f502bb389d1ff400bbcd206987d48ff07dd
 2021-02-19 16:39:39 +00:00
Lorenzo Colitti
adf1883cee Merge "Delete VPN methods in ConnectivityManager." am: e8817c1796 am: 7e292e7920 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I247b42083f5fe9d4f5e3a13a3b3c61ab2bcf5bcc
 2021-02-19 16:39:19 +00:00
Christian Frank
04151fe4ae Merge "Add attribution to the audio access of MusicRecognitionManagerService." into sc-dev 2021-02-19 16:22:12 +00:00
Robert Horvath
d34a5f6aab Merge "Document behaviour of "quiescent" reboot reason" into sc-dev 2021-02-19 16:14:14 +00:00
Nataniel Borges
d88a8d2036 Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 7096deadf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3572428c0044d410055a53f4bff680c2dd474028
 2021-02-19 16:12:03 +00:00
Lorenzo Colitti
7e292e7920 Merge "Delete VPN methods in ConnectivityManager." am: e8817c1796 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b2968f3b0c6ed9d693f56c4f4697f410c706085
 2021-02-19 16:06:51 +00:00
Nataniel Borges
7096deadf4 Merge "Revert "Delete VPN methods in ConnectivityManager."" 2021-02-19 15:32:46 +00:00
Nataniel Borges
51bf8e979e Revert "Delete VPN methods in ConnectivityManager." 
This reverts commit 279b79f062.

Bug: 180710918
Reason for revert: Broken build 

Change-Id: I6e6318b4c01ccab27ca3e9f16bb2194aa1d9ffd2
 2021-02-19 15:25:33 +00:00
Lorenzo Colitti
e8817c1796 Merge "Delete VPN methods in ConnectivityManager." 2021-02-19 14:56:04 +00:00
Alex Johnston
59536a1edb Merge "Handle isUsbDataSignalingEnabledForUser PO case" into sc-dev 2021-02-19 12:22:30 +00:00
Robert Shih
9801437128 Merge "MediaDrm: comprehensive exception messages" into sc-dev 2021-02-19 12:06:32 +00:00
Bill Yi
b47db2a2de Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I08afdb46214353d4311182215619e7445aec98b5
 2021-02-19 11:40:33 +00:00
Ilya Matyukhin
1fef6a0afe Update IFingerprint TestHal with close and reset methods 
Bug: 180521746
Test: atest CtsBiometricsTestCases
Change-Id: Icf60a835ad5c5d4fa17a9bab78a00a6f1b40e648
 2021-02-19 02:14:52 -08:00