Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,377 Commits 3 Branches 0 Tags
aa3dbde0d4385745de73bda62d21f43de2fc3ac0
Commit Graph

760377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kweku Adams
aa3dbde0d4 Merge changes from topic "presubmit-am-d5f746d3f5a042c2874e68e6ef543b23" into tm-mainline-prod 
* changes:
  [automerge] Fix starting job logging. 2p: 9ec24237e6
  Fix starting job logging.
 2022-04-09 03:39:47 +00:00
TreeHugger Robot
a564c97b40 Merge changes from topic "presubmit-am-aa52f852a18e47f0a700e433e34596a3" into tm-mainline-prod 
* changes:
  [automerge] Fix pending queue job presence check. 2p: 5fa3a16679
  Fix pending queue job presence check.
 2022-04-09 03:28:16 +00:00
Sudheer Shanka
c0c9f2d486 Merge "Ignore older UID state change callbacks in NPMS." into tm-dev am: 1e96db49dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575428

Change-Id: Ib414ae5f78ba8be25d288cf7d98a9c26da64c585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 02:29:37 +00:00
TreeHugger Robot
c3ced04d84 Merge "Limit number of notification actions created" into tm-dev am: 7a06b6ae73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17640134

Change-Id: I7180715a1cb266da9585621ca9127f0b9ba83c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 02:28:57 +00:00
Sudheer Shanka
1e96db49dc Merge "Ignore older UID state change callbacks in NPMS." into tm-dev 2022-04-09 02:12:58 +00:00
Sudheer Shanka
d080ae2a62 Merge changes from topic "presubmit-am-5e5e800589e44f6191b43f11ad45923e" into tm-mainline-prod 
* changes:
  [automerge] Ignore older UID state change callbacks in NPMS. 2p: b57c865855
  Ignore older UID state change callbacks in NPMS.
 2022-04-09 02:12:58 +00:00
TreeHugger Robot
7a06b6ae73 Merge "Limit number of notification actions created" into tm-dev 2022-04-09 02:11:33 +00:00
TreeHugger Robot
58314568cd Merge changes from topic "presubmit-am-47bcb3b2a4e14d349285acfc36c61606" into tm-mainline-prod 
* changes:
  [automerge] Limit number of notification actions created 2p: 1861abe8f2
  Limit number of notification actions created
 2022-04-09 02:11:33 +00:00
Joanne Chung
7c4f57edbd Merge "Disable these four test cases of HotwordDetectionServiceBasicTest" into tm-dev am: 5ed1be6c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17660723

Change-Id: Ib6f72bada9f6cdf4e31e90201dd5b3ab0ca77967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:47:57 +00:00
Joanne Chung
5ed1be6c4c Merge "Disable these four test cases of HotwordDetectionServiceBasicTest" into tm-dev 2022-04-09 01:47:43 +00:00
Beth Thibodeau
02a5df4294 Merge "Add play/pause button when state has ACTION_PLAY_PAUSE" into tm-dev am: 767d362b56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17652004

Change-Id: Ie4afb8dd2510e8828b61f63d2bc69ac6da3717ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:47:43 +00:00
Beth Thibodeau
767d362b56 Merge "Add play/pause button when state has ACTION_PLAY_PAUSE" into tm-dev 2022-04-09 01:39:46 +00:00
Beth Thibodeau
5da91192a6 Merge changes from topic "presubmit-am-66f9fba9d0a249a588735f9b6b3a2a81" into tm-mainline-prod 
* changes:
  [automerge] Add play/pause button when state has ACTION_PLAY_PAUSE 2p: 872a9d7591
  Add play/pause button when state has ACTION_PLAY_PAUSE
 2022-04-09 01:39:46 +00:00
Lyn Han
0bb980c83a Merge changes from topics "presubmit-am-121da4597331411b86c0a3f45eabcc4c", "presubmit-am-85bb9a360df04e4fa2dd6536bf36fa36" into tm-dev am: e5d0c2d25a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17623677

Change-Id: I064cb21a25b506fa6d37e42a7785f9c58a997157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:37:38 +00:00
TreeHugger Robot
6f28f059b7 Merge "[Media TTT] Don't show scrubbing times if we don't have the prev or next button." into tm-dev am: 7af8cbc481 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17638186

Change-Id: I11f56fba89ad15feeaff1f24a48604104c4fb6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:37:02 +00:00
Lyn Han
e5d0c2d25a Merge changes from topics "presubmit-am-121da4597331411b86c0a3f45eabcc4c", "presubmit-am-85bb9a360df04e4fa2dd6536bf36fa36" into tm-dev 
* changes:
  Add missing divider height before notification shelf
  Rename notification padding to divider height
 2022-04-09 01:34:30 +00:00
Lyn Han
426826283e Merge changes from topic "presubmit-am-85bb9a360df04e4fa2dd6536bf36fa36" into tm-mainline-prod 
* changes:
  [automerge] Rename notification padding to divider height 2p: d73fe9b586
  Rename notification padding to divider height
 2022-04-09 01:34:30 +00:00
TreeHugger Robot
7af8cbc481 Merge "[Media TTT] Don't show scrubbing times if we don't have the prev or next button." into tm-dev 2022-04-09 01:31:47 +00:00
TreeHugger Robot
9d37f5cad3 Merge changes from topic "presubmit-am-3f35f40374184e3480deaf7734bfee10" into tm-mainline-prod 
* changes:
  [automerge] [Media TTT] Don't show scrubbing times if we don't have the prev or next 2p: 4473652146
  [Media TTT] Don't show scrubbing times if we don't have the prev or next button.
 2022-04-09 01:31:47 +00:00
TreeHugger Robot
9f57d42fcd Merge "Use larger frame of settings button for clicks" into tm-dev am: 014c3b07d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17662104

Change-Id: I2962c8a6a02f3496b2209a2d1dc4a87f0c30abf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:25:15 +00:00
TreeHugger Robot
53ba72a702 Merge "Stop tracking ghost jobs." into tm-dev am: 323def8350 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17664330

Change-Id: I2bcfdf863a5b9f9021f93a859ea6466481caa72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:24:27 +00:00
Santos Cordon
88352bd175 Merge "Add automatic brightness events to dumpsys" into tm-dev am: ecaa57bbe4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658383

Change-Id: I9e06ad5874f036e03c122821e0b2506679187107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:23:39 +00:00
TreeHugger Robot
4c6385ae43 Merge "Add Flicker tests for launching app from Notification CUJ" into tm-dev am: 64d297bc49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17617006

Change-Id: Idb241b8e74dd77663b71cbf6fbb6070d4ed82713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 01:22:32 +00:00
TreeHugger Robot
014c3b07d0 Merge "Use larger frame of settings button for clicks" into tm-dev 2022-04-09 01:14:26 +00:00
TreeHugger Robot
4447fa4b04 Merge changes from topic "presubmit-am-a3bd4951382d48b280e66473338b8997" into tm-mainline-prod 
* changes:
  [automerge] Use larger frame of settings button for clicks 2p: 638f61a57a
  Use larger frame of settings button for clicks
 2022-04-09 01:14:25 +00:00
TreeHugger Robot
323def8350 Merge "Stop tracking ghost jobs." into tm-dev 2022-04-09 01:12:03 +00:00
TreeHugger Robot
d714c873b7 Merge changes from topic "presubmit-am-083081757467413cac605b11b4b2ef85" into tm-mainline-prod 
* changes:
  [automerge] Stop tracking ghost jobs. 2p: c554e92792
  Stop tracking ghost jobs.
 2022-04-09 01:12:03 +00:00
Santos Cordon
ecaa57bbe4 Merge "Add automatic brightness events to dumpsys" into tm-dev 2022-04-09 01:04:35 +00:00
TreeHugger Robot
64d297bc49 Merge "Add Flicker tests for launching app from Notification CUJ" into tm-dev 2022-04-09 01:02:07 +00:00
TreeHugger Robot
f38a32abc4 Merge changes from topic "presubmit-am-2212392d9aa44292be5190d5edb8fd96" into tm-mainline-prod 
* changes:
  [automerge] Add Flicker tests for launching app from Notification CUJ 2p: c2266ad6cb
  Add Flicker tests for launching app from Notification CUJ
 2022-04-09 01:02:07 +00:00
Xiaowen Lei
b2d7952fc7 Merge "Log event for bouncer fully visible after dream swiped up." into tm-dev am: f52220af19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17629040

Change-Id: Ifa8f85e9add2afa6d581e9484d5b336a35ec2c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 00:27:45 +00:00
Xiaowen Lei
f52220af19 Merge "Log event for bouncer fully visible after dream swiped up." into tm-dev 2022-04-09 00:11:59 +00:00
Xiaowen Lei
d8c3bc8a68 Merge changes from topic "presubmit-am-d5d1c12250244853a71c033299605b35" into tm-mainline-prod 
* changes:
  [automerge] Log event for bouncer fully visible after dream swiped up. 2p: fb9f2de784
  Log event for bouncer fully visible after dream swiped up.
 2022-04-09 00:11:58 +00:00
Jack Yu
7a865c4c04 Merge "Increased the bugreport title maximum length to 100" into tm-dev am: c27b0bceba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658957

Change-Id: I81867b3a6272cbe7a45cfea4986ca9ddf1e5c6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 23:26:10 +00:00
Jack Yu
c27b0bceba Merge "Increased the bugreport title maximum length to 100" into tm-dev 2022-04-08 23:00:36 +00:00
Jack Yu
3b65b5f306 Merge changes from topic "presubmit-am-76a0661477634fa59e88f792ef7d874b" into tm-mainline-prod 
* changes:
  [automerge] Increased the bugreport title maximum length to 100 2p: 9ff4d709b9
  Increased the bugreport title maximum length to 100
 2022-04-08 23:00:36 +00:00
TreeHugger Robot
f1b9ae0941 Merge "Specify whether or not the disconnected string should be used" into tm-dev am: 01f7e54f19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17388861

Change-Id: I193d53fa013a65fb458d9fa6e8e5b671366680c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 22:37:33 +00:00
TreeHugger Robot
01f7e54f19 Merge "Specify whether or not the disconnected string should be used" into tm-dev 2022-04-08 22:21:02 +00:00
TreeHugger Robot
dc9dc8f9a9 Merge "Guard against incorrect ID assignment in CdmService" into tm-dev am: eaceca75b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17654874

Change-Id: I904bfb10e76e499d340016b63fbd8be6d876c2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 22:14:17 +00:00
Sungcheol Ahn
08950ff2a5 Merge "[Telephony] added VOWIFI_TTY_SUPPORTED key on CarrierConfig" into tm-dev am: 5c357d2c82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17651752

Change-Id: Ib6414348c1101eaae7655b1cf2c7303f35bcd81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 22:12:56 +00:00
TreeHugger Robot
eaceca75b8 Merge "Guard against incorrect ID assignment in CdmService" into tm-dev 2022-04-08 22:11:12 +00:00
TreeHugger Robot
ac1bd8a64a Merge changes from topic "presubmit-am-b8c92f3352a44b68aa16fbbc6837c783" into tm-mainline-prod 
* changes:
  [automerge] Guard against incorrect ID assignment in CdmService 2p: 8228658b69
  Guard against incorrect ID assignment in CdmService
 2022-04-08 22:11:11 +00:00
Sungcheol Ahn
5c357d2c82 Merge "[Telephony] added VOWIFI_TTY_SUPPORTED key on CarrierConfig" into tm-dev 2022-04-08 21:55:54 +00:00
Presubmit Automerger Backend
7966650b38 [automerge] Ignore older UID state change callbacks in NPMS. 2p: b57c865855 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575428

Bug: 226299593
Change-Id: I58d52beabc1403a77bd0920f6967db97cdf60697
 2022-04-08 20:46:57 +00:00
Sudheer Shanka
b57c865855 Ignore older UID state change callbacks in NPMS. 
Since the onUidStateChanged() callbacks will be
happening from more than one thread, we need to make
sure we only handle the latest uid state change
callbacks and ignore any older callbacks that could
override the latest uid states in NPMS. In order to
this, every uid state change will be associated with
a unique seq number.

Also, remove the UidRecord.lastDispatchedProcStateSeq.
This was added as a safety measure to make sure we
don't unnecessarily end up waiting but it isn't
necessary and if we need to keep it, we need to add
a way to access it without holding global AMS lock,
which isn't worth the complexity.

Bug: 226299593
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I631f5e01f6627916a96c930c22849a1d11eab636
 2022-04-08 13:45:54 -07:00
Kweku Adams
2738a78b02 [automerge] Fix starting job logging. 2p: 9ec24237e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666549

Bug: 141645789
Change-Id: Ie8d35b2f3ddcd9e982db9706596916a59759f2c2
 2022-04-08 20:43:11 +00:00
Kweku Adams
9ec24237e6 Fix starting job logging. 
We were accidentally logging that we were about to start the last job in
the pending queue instead of the job we intended to start.

Bug: 141645789
Test: Enable verbose logging and read logcat
Change-Id: I37edb3fe9b1d55ebc4587bd15677330c89bff923
 2022-04-08 20:41:05 +00:00
Bill Yi
2a8d489009 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bbe0c62d66 -s ours am: 32910d0da9 -s ours am: e42c779e4f -s ours am: dd7c5737a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f48e714946cb865e62ee09090bf2d5e576a8c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:56:53 +00:00
Bill Yi
c1773e707a [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf87 -s ours am: f2b5cf274c -s ours am: f1b2e36f35 -s ours am: 02c3da8418 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3754dfd2d1c09fcb054fae70bc3ca298ef853c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:56:35 +00:00
Mateusz Cicheński
eae8650790 Merge "Make PiP round corners when entering from split screen." into tm-dev am: 0b6bf0f229 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627555

Change-Id: Id03c9a8169572f6e7bf27e376ccb22d13153205d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:55:36 +00:00