Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
753,912 Commits 3 Branches 0 Tags
53e39e5d061064fdf34eccabc7b3c6bc29a1a703
Commit Graph

753912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Rosky
53e39e5d06 Merge "Pass through Recent's finish-but-not-really intent" into tm-dev 2022-03-23 22:45:17 +00:00
Hongwei Wang
4b1f6bbae3 Merge "Add IPipAnimationListener#onExpandPip" into tm-dev 2022-03-23 22:39:30 +00:00
Ray Essick
48d5cfa846 Merge "Integrate feedback from MediaMetrics API reviews" into tm-dev 2022-03-23 22:38:59 +00:00
TreeHugger Robot
5c687a5145 Merge "Clarifying docs for USE_EXACT_ALARM" into tm-dev 2022-03-23 21:26:59 +00:00
Christian Göllner
d7b3be3e0b Merge "Media layout changes for tablets" into tm-dev 2022-03-23 20:44:00 +00:00
Diego Vela
c3cf521667 [automerger skipped] Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev am: c7dada96bb am: df6fc64952 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17342980

Change-Id: I3cb03ee38bd75f3ef1b13b0116ac25de3aea6b24
 2022-03-23 20:35:07 +00:00
Treehugger Robot
41c41f9821 [automerger skipped] Merge "Add setEthernetEnabled and its listener API" am: 3b4812350f am: c05949b4af am: 5a00916196 -s ours 
am skip reason: Merged-In Iefd24d955572589c5bd3ca9a8139ea6e44979e8a with SHA-1 ac2b193faf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027927

Change-Id: Iadb8ece09553e757f5c82cbb980dc003ffc26cf5
 2022-03-23 20:34:46 +00:00
Rambo Wang
1e0618ac80 [automerger skipped] Merge "Update TelephonySubscriptionTracker to use new CPCallback interface" am: f146ee5a1b am: 66d19b9f34 am: c3f28b7786 -s ours 
am skip reason: Merged-In I58dbbc4b7b135781bc5f4b5bc35b29075fc6a619 with SHA-1 374f0045ba is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037586

Change-Id: I00d88a222d1e465fb477f446c67d18190b70ec38
 2022-03-23 20:33:56 +00:00
Rambo Wang
9dc8e3b27a [automerger skipped] Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343dfb am: d81fc9d312 am: 8f04c7b7f3 -s ours 
am skip reason: Merged-In I29df8599bdfc84cab330fa7056a228997a4bac0f with SHA-1 28b2ee8ec0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2039223

Change-Id: I7ca52d4a07a276264d4634a5ccf26776a31c8bfc
 2022-03-23 20:32:52 +00:00
Diego Vela
df6fc64952 Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev am: c7dada96bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17342980

Change-Id: Ibd2853035091df8b6c44ec1b3000a323a8a404e0
 2022-03-23 20:32:06 +00:00
Diego Vela
d8014c8554 Merge changes from topic "presubmit-am-6493193fb96f4675a3f0727cb0aa9ffa" into sc-v2-dev-plus-aosp am: 5f634bf42e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17342980

Change-Id: I8918f1ff35dfdbcdec055f530c2ebd15b874cc4e
 2022-03-23 20:31:51 +00:00
Presubmit Automerger Backend
d7100bd7b7 [automerger skipped] [automerge] DO NOT MERGE Fix Emulator not emitting folding features. 2p: 98ca72c5f8 am: fac09ad9ab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17342980

Change-Id: Ibc1183be890c9cbd56fd919cddcb55c1a949de39
 2022-03-23 20:31:36 +00:00
Michael Wachenschwanz
7dd534b98a Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev 2022-03-23 20:25:44 +00:00
Chavi Weingarten
3e3c3ab2da Merge "Add forceDrawNextFrame function for HardwareRenderer" into tm-dev 2022-03-23 20:20:13 +00:00
Treehugger Robot
5a00916196 Merge "Add setEthernetEnabled and its listener API" am: 3b4812350f am: c05949b4af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027927

Change-Id: Ifa06c4f75acb872c3297d2a9a77101bebbad1c05
 2022-03-23 20:19:14 +00:00
Rambo Wang
c3f28b7786 Merge "Update TelephonySubscriptionTracker to use new CPCallback interface" am: f146ee5a1b am: 66d19b9f34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037586

Change-Id: Idb45073582935b1c3b2e665b6f82c0ecd4f2037d
 2022-03-23 20:17:58 +00:00
Rambo Wang
8f04c7b7f3 Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343dfb am: d81fc9d312 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2039223

Change-Id: If715a6e17797ea876c705fc87f36b110703ebfcc
 2022-03-23 20:15:59 +00:00
Diego Vela
c7dada96bb Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev 2022-03-23 20:15:13 +00:00
Diego Vela
5f634bf42e Merge changes from topic "presubmit-am-6493193fb96f4675a3f0727cb0aa9ffa" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] DO NOT MERGE Fix Emulator not emitting folding features. 2p: 98ca72c5f8
  DO NOT MERGE Fix Emulator not emitting folding features.
 2022-03-23 20:15:13 +00:00
Matt Casey
1c6f7596c2 Merge "Minor Copy/Paste overlay UI edits" into tm-dev 2022-03-23 20:11:14 +00:00
Treehugger Robot
c05949b4af Merge "Add setEthernetEnabled and its listener API" am: 3b4812350f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027927

Change-Id: I9a11545a496ea6538fe1aab19ad9ffc05734556e
 2022-03-23 19:58:02 +00:00
Rambo Wang
66d19b9f34 Merge "Update TelephonySubscriptionTracker to use new CPCallback interface" am: f146ee5a1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037586

Change-Id: I7150a2bf374e0e655c362cb63de0ad88d26ef939
 2022-03-23 19:55:57 +00:00
Rambo Wang
d81fc9d312 Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343dfb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2039223

Change-Id: I5b54dc6e55469004fa53dc375e4dbf15ddb7c70c
 2022-03-23 19:54:12 +00:00
Treehugger Robot
3b4812350f Merge "Add setEthernetEnabled and its listener API" 2022-03-23 19:40:19 +00:00
Rambo Wang
f146ee5a1b Merge "Update TelephonySubscriptionTracker to use new CPCallback interface" 2022-03-23 19:37:59 +00:00
Rambo Wang
8ec6343dfb Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" 2022-03-23 19:34:02 +00:00
Hawkwood Glazier
2e92c6b7f7 Merge "Pause squiggle animation when seeking" into tm-dev 2022-03-23 19:23:55 +00:00
Aaron Liu
c7ce201c2c Merge "User Switcher: Polish tap on user switcher." into tm-dev 2022-03-23 19:13:49 +00:00
TreeHugger Robot
329ed6ef8e [automerger skipped] Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev am: cbb04a4286 -s ours am: 076a758f5d -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 efc50877d2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988

Change-Id: I3faf62e292379b1890d678f32cf9d8df07bbe697
 2022-03-23 18:53:51 +00:00
TreeHugger Robot
8572affd55 [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d398625 -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988

Change-Id: If8e3efb1ac3898724d89214790b9fea7c9603948
 2022-03-23 18:52:45 +00:00
Presubmit Automerger Backend
2f137b638f [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988

Change-Id: I8fb4325dae33c39709ee59f5557f708a06b6321c
 2022-03-23 18:52:21 +00:00
TreeHugger Robot
076a758f5d [automerger skipped] Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev am: cbb04a4286 -s ours 
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 efc50877d2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988

Change-Id: I20dbc3c85f39170631de0715d0eb89daf302bf6a
 2022-03-23 18:51:48 +00:00
Lais Andrade
352d8d7abe Merge "Fix PIN lock pattern not respecting user settings" into tm-dev 2022-03-23 18:36:58 +00:00
TreeHugger Robot
cbb04a4286 Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev 2022-03-23 18:35:38 +00:00
TreeHugger Robot
d53d398625 Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2
  Fix ServiceConnector failing unbind if not connected.
 2022-03-23 18:35:38 +00:00
Alex Johnston
6563740430 Merge "Add role protection level to MODIFY_QUIET_MODE" into tm-dev 2022-03-23 18:30:29 +00:00
Mady Mellor
4db1adb65e Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev 2022-03-23 18:27:38 +00:00
Mady Mellor
139a3c1803 Merge "Adjust the sizes of user education for large screens / landscape" into tm-dev 2022-03-23 18:25:45 +00:00
Kohsuke Yatoh
04b5ad3c49 Merge changes from topic "presubmit-am-fd9c10e17ae94cf5b5b47b78cd7c56b3" into tm-dev 
* changes:
  Wait for IME animation to end before calling IMM.
  Drop "adb shell" from RunCommandTargetPreparer.
 2022-03-23 18:11:35 +00:00
Shaun Corkran
a4889a2180 Merge "Add CrossTaskNavigations API to restrict navigation from current task" into tm-dev 2022-03-23 17:57:37 +00:00
Nataniel Borges
e08000c02d Merge "Allow LaunchBubble app to be launcher from launcher" into tm-dev 2022-03-23 17:47:26 +00:00
Tiger Huang
0797d97536 Merge "Introduce updateVisibility and updateLayout" into tm-dev 2022-03-23 17:44:42 +00:00
Steve Elliott
c8a32ef1f8 Merge "Remove unneeded notif vis checks" into tm-dev 2022-03-23 17:36:13 +00:00
Sooraj Sasindran
2844eaf9f7 Merge "Get device owner app admin" into tm-dev 2022-03-23 17:21:00 +00:00
John Wu
7128e88488 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 am: 289609bdb3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: Iddeb472553b4713fc51613effa6e565188119bf8
 2022-03-23 17:20:24 +00:00
Lucas Dupin
f4dbcd621f Merge "Asynchronously bind/unbind service" into tm-dev 2022-03-23 17:11:24 +00:00
Elis Elliott
cb2985a2ae Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev 2022-03-23 17:08:01 +00:00
John Wu
289609bdb3 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: Iaf6508517a2078145f639cd7694a3ffa0cd9e997
 2022-03-23 17:02:17 +00:00
John Wu
2e64dda571 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: I80b9a9a9f84466c49e4dfe80d14cd302fcc7f4e3
 2022-03-23 16:39:08 +00:00
Ytai Ben-tsvi
1ffa981ea5 Merge "Check for null callback" into tm-dev 2022-03-23 16:36:16 +00:00