Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,797 Commits 3 Branches 0 Tags
a9185e3a4f851134512eec8fea67fd90ad8af2c2
Commit Graph

16689 Commits

Author SHA1 Message Date
Jeff DeCew
a9185e3a4f Merge "Add notifications team as OWNERS of notification-related utilities and their tests" am: 39366563d3 am: bce9262c0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796768

Change-Id: I30d28b693988ab1234dc951ff3a7ca7fc1640ac9
 2021-08-24 17:34:07 +00:00
Jeff DeCew
bce9262c0d Merge "Add notifications team as OWNERS of notification-related utilities and their tests" am: 39366563d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796768

Change-Id: I6bd3759e5e7e37aaa1a2dbcda3b0ecba073a67a0
 2021-08-24 17:13:15 +00:00
Jeff DeCew
1cbc573b93 Add notifications team as OWNERS of notification-related utilities and their tests 
Change-Id: I153ab4e182a0843706c25f03c891a92eb48eea9c
 2021-08-16 14:56:48 +00:00
Xin Li
773a9dfba7 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: I661f5fb6b1f3f6ce4322fab8fa84a7ab364c65b1
Change-Id: I16482b494ff4821016aabbb646e495d616c630ac
 2021-08-14 07:23:27 +00:00
Nate Myren
9d1a9399b8 Merge "Add attribution info to start callbacks" into sc-dev am: 5d97f29218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15446590

Change-Id: I42bdf188ec74c9d3a7179f717a08c7fec7f33833
 2021-08-03 20:06:34 +00:00
Nate Myren
06d07d54db Add attribution info to start callbacks 
Add attribution flags and chain IDs to start callbacks, and have the
PermissionUsageHelper listen for starts. This ensures that, if another
start happens while an op is already running, and has chain information,
then this chain information will be recorded.

Test: manual
Bug: 194198234
Change-Id: I0ab1aa0969b70e18001f4a814ea5689f9329a019
 2021-08-03 08:25:31 -07:00
Li Li
f97b1decee Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I997b46822bd83f9c9f7dc6a02e9514a95b3758a1
 2021-07-30 16:49:33 +00:00
Li Li
ef12967b75 Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev 2021-07-30 16:35:16 +00:00
lucaslin
4396c1b244 Fix Ikev2 vpn cannot establish through startLegacyVpn() 
Settings will also call startLegacyVpn() to bring up Ikev2 VPN,
so it's needed to add a vpn type check in startLegacyVpn().
Otherwise, UnsupportedOperationException will be thrown when
Settings tries to bring up Ikev2 VPN.

Bug: 191937302
Bug: 188749090
Bug: 189808606
Test: 1. make gts && gts-tradefed
      2. run gts --module GtsNetworkStackHostTestCases
Change-Id: I752c39bd1bf953a11bdf62e6f02f99f48fef23c4
Merged-In: I752c39bd1bf953a11bdf62e6f02f99f48fef23c4
 2021-07-30 06:25:21 +00:00
Li Li
bbe06e7b59 Freezer: fix exception when parsing /proc/locks 
The original code is based on /proc/locks manpage. Unfortunately, that
manpage is never correctly updated to include the new field for blocked
locks. The new code detects the extra field. As StringTokenizer is too
heavy, ProcFileReader is used for better performance.

Bug: 194756340
Test: FrameworksUtilTests com.android.internal.util.ProcFileReaderTest
Test: FrameworksCoreTests com.android.internal.os.ProcLocksReaderTest
Test: No /proc/locks parsing exception with blocked locks
Change-Id: I4c9763f9d3091f7d84d2e4b672d7e5cb78b33f59
 2021-07-29 09:18:53 -07:00
Daniel Solomon
ae50161de8 Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev am: d5e1458566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404418

Change-Id: I7782fd8704f1b7c2444b6630ce001875b19d6931
 2021-07-28 17:58:09 +00:00
Daniel Solomon
d5e1458566 Merge "Revert "SCREEN_BRIGHTNESS - map 255 to current max"" into sc-dev 2021-07-28 17:42:43 +00:00
Daniel Solomon
792229b553 Revert "SCREEN_BRIGHTNESS - map 255 to current max" 
This reverts commit 002e656a51.

Reason for revert: Setting brightness using adb (adb shell settings put system screen_brightness ...) results in different brightness being set by DisplayPowerController each time.

Bug: 194791517
Test: atest HighBrightnessModeControllerTest
Test: manually test `settings put system screen_brightness 23` yields
      consistent results
Change-Id: I6b49253b46e4d09a1f4129d3df950c9d36eb6ede
 2021-07-28 17:17:15 +00:00
Hai Zhang
831f5db04f Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: I2afc85c266bebcb88848c57a094ed0af757b277e
 2021-07-28 01:41:05 +00:00
Hai Zhang
af04dd2ad5 Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev 2021-07-28 01:23:12 +00:00
Siim Sammul
b77fb08506 Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev am: 6c852aeabc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346904

Change-Id: I73089da899cfe25a90f5d52d894ab3ba0291ef1b
 2021-07-26 09:25:51 +00:00
Siim Sammul
6c852aeabc Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev 2021-07-26 09:14:43 +00:00
Alison Cichowlas
fa25c27e48 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev am: 832779a555 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377016

Change-Id: I0c1df12a77fdfafe0ab87d28400a77c84b42ceb6
 2021-07-24 06:06:52 +00:00
Alison Cichowlas
832779a555 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev 2021-07-24 05:53:04 +00:00
Alison Cichowlas
6e6455518c Sharesheet: remove 2 separators, restyle the 3rd. 
Test: Manual
Bug: 178619070
Change-Id: I9a6797863be2d0220fb71b2b9ca1d04c1f279b02
 2021-07-23 21:43:22 +00:00
Alison Cichowlas
ddbade4025 Merge "Sharesheet: be more defensive about un-unparcelable intents." into sc-dev am: a1d1a38269 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374840

Change-Id: I86883751c47eeb4f3bc2b5ba51ff6c4a154fba69
 2021-07-23 21:42:45 +00:00
Alison Cichowlas
a1d1a38269 Merge "Sharesheet: be more defensive about un-unparcelable intents." into sc-dev 2021-07-23 21:31:40 +00:00
Santos Cordon
379e94d1da Merge "SCREEN_BRIGHTNESS - map 255 to current max" into sc-dev am: e4e836a175 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359296

Change-Id: Ic2d569cc3c914945b8fc322b920f8aa6d7f9d007
 2021-07-23 20:17:24 +00:00
Santos Cordon
e4e836a175 Merge "SCREEN_BRIGHTNESS - map 255 to current max" into sc-dev 2021-07-23 20:13:55 +00:00
Alison Cichowlas
417b15994a Sharesheet: be more defensive about un-unparcelable intents. 
Test: atest ChooserActivityTest
Bug: 194359789
Change-Id: I2fb0c0e120f048042dea499e1ffc126989e0e2d2
 2021-07-23 12:17:29 -04:00
Alison Cichowlas
34ff8cdeaf Merge "Sharesheet: action bar is independent of WP tabs, should always launch as primary user." into sc-dev am: 9197f7b260 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363687

Change-Id: Idc076592b635f7787e6b41b53755e1933ae32b45
 2021-07-23 15:08:10 +00:00
Alison Cichowlas
9197f7b260 Merge "Sharesheet: action bar is independent of WP tabs, should always launch as primary user." into sc-dev 2021-07-23 14:54:12 +00:00
Alison Cichowlas
f0657fc49e Sharesheet: action bar is independent of WP tabs, should always launch 
as primary user.

Bug: 193424706
Test: atest ChooserActivityTest; manual per bug steps

Change-Id: Ie680270fa6a62ec59f35715514bfc0232b0d12f9
 2021-07-22 20:43:21 -04:00
Santos Cordon
002e656a51 SCREEN_BRIGHTNESS - map 255 to current max 
Since the current max can change for brightness due to
high-brightnes-mode (HBM), make it so that 255 is always mapped
to the current max, which can be different when in HBM or normal
brightness mode.

Bug: 187784093
Test: atest HighBrightnessModeControllerTest
Test: manually verify 255 is used for max when in HBM or not.
Change-Id: Ib0631fc12de0e8e4c7c638901d82c362e79944c3
 2021-07-22 18:34:37 +01:00
Nikita Ioffe
6cbb784216 Restrict what APEXes different installers can update am: e501fd8379 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331871

Change-Id: I3548f8a43e237fb3e7ee3d8ccaf303239153f5c1
 2021-07-22 17:21:18 +00:00
Siim Sammul
8f31e9d663 Do not make a getThreadTimeMicro() call when it is not needed. This was 
accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830

Bug: 193543224
Test: N/A no functionality change, just avoiding a method call
Change-Id: If4579e96cd5aab41a46f60b5133938e81d608cff
 2021-07-22 09:22:56 +00:00
Nikita Ioffe
e501fd8379 Restrict what APEXes different installers can update 
* Mainline APEXes can only be updated by a modulesInstaller (an entry
in whitelisted-staged-installer.xml with isModulesInstaller="true")

* The whitelisted-staged-installer.xml file can have only one entry with
isModulesInstaller="true"

* Vendor APEXes can only be updated by an installer defined in the
corresponding entry in vendor-apex-allowlist.xml.

BYPASS_INCLUSIVE_LANGUAGE_REASON=existing occurrences

Test: atest StagedInstallInternalTest
Test: atest GtsStagedInstallHostTestCases
Test: atest CtsRollbackManagerHostTestCases
Test: atest CtsStagedInstallHostTestCases
Bug: 190802380
Change-Id: I729abb5153df079fb6885016a4b41d0acc827e3c
 2021-07-21 16:44:42 +01:00
Wu Ahan
4a5ea0ecce Merge "Fix potential memory leak of FrameTracker" into sc-dev am: aef0db8f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334110

Change-Id: I93c2f29eff492356d1618501450d2079eccf6aaf
 2021-07-20 15:27:00 +00:00
Ahan Wu
65a3d5dfa4 Fix potential memory leak of FrameTracker 
If begin and end invocations are at the same frame, the end vsync id
will be smaller than the begin vsync id, results in zero size jank info
array, the finish call will be missed as well, a leak happens.

Bug: 192140966
Test: atest FrameTrackerTest InteractionJankMonitorTest
Change-Id: I388558e60bdb84ad248a9afabe7776c4e6e67c57
 2021-07-20 06:31:41 +00:00
Treehugger Robot
54c9ff981e Merge "Added Ble scan APIs to BatteryStatsManager" 2021-07-19 15:32:41 +00:00
Remi NGUYEN VAN
8608d0626e Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" 2021-07-19 09:47:21 +00:00
Hai Zhang
2d6a545e30 Only construct real Throwable objects in AndroidFuture.readThrowable(). 
Bug: 186530450
Test: atest CtsSecurityTestCases:android.security.cts.AndroidFutureTest
Change-Id: Icc5ce702f0cd84e9136dee3c65f63619df697358
 2021-07-16 19:02:23 +00:00
Dmitri Plotnikov
c37c2ba216 Merge "Fix BatteryStatsImplTest." into sc-dev am: 4162c032bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15291010

Change-Id: Ib21cd08963534c6622d095c0b3d6b7ebc4a97bcc
 2021-07-16 00:48:02 +00:00
Dmitri Plotnikov
4162c032bf Merge "Fix BatteryStatsImplTest." into sc-dev 2021-07-16 00:26:16 +00:00
Dmitri Plotnikov
21dd5325fb Fix BatteryStatsImplTest. 
Bug: 180015146
Test: atest FrameworksCoreTests:BatteryStatsImplTest

Change-Id: I6b43ca03ba816e12735ebd47d8cf61a6b1cee110
 2021-07-15 14:51:18 -07:00
Etienne Ruffieux
29cb9a7c90 Added Ble scan APIs to BatteryStatsManager 
Added missing service functions to manager to prevent directly
calling BatteryStatsService from Bluetooth package. Updated
system-current.txt accordingly.

Tag: #feature
Bug: 190442794
Test: Manual
Merged-In: Ie6c6d3688d2da45956d57ea1dbc2cc4430f27783
Change-Id: Ie6c6d3688d2da45956d57ea1dbc2cc4430f27783
 2021-07-15 16:40:57 +00:00
TreeHugger Robot
1c32cef21f Merge "Added Ble scan APIs to BatteryStatsManager" into sc-dev-plus-aosp 2021-07-15 16:19:08 +00:00
TreeHugger Robot
a85fbd4376 Merge "Make Verification text shrink to zero size for long names or large fonts." into sc-dev am: 4820907a6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237713

Change-Id: Ic294234246552d3f5b656d8ffff1932a851d197e
 2021-07-14 13:57:11 +00:00
TreeHugger Robot
4820907a6b Merge "Make Verification text shrink to zero size for long names or large fonts." into sc-dev 2021-07-14 13:46:45 +00:00
Hans Boehm
fbccd18cb1 Merge "Use tmpArgBuffer correctly when argBuffer is null" am: a7fbddac5f am: 6d7cf56683 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1762425

Change-Id: Ie7f2e9987469c84d7f039519da3ac73120cbc1d0
 2021-07-14 01:08:18 +00:00
Daniel Sandler
6b4145107f Merge changes from topic "egg12" into sc-dev am: 51204c444a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241669

Change-Id: I8b4f140fbb274c27322edbce630b48d0421baa07
 2021-07-13 19:47:05 +00:00
Daniel Sandler
51204c444a Merge changes from topic "egg12" into sc-dev 
* changes:
  Bubbling up some of these great new colors.
  AnalogClock: Allow subclasses to override the "now" instant.
 2021-07-13 19:37:48 +00:00
Dan Sandler
28f8033d80 Bubbling up some of these great new colors. 
Bug: 177962166
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
Change-Id: I92cfe3f9e2294d888dfaa5f30591885804d8302b
 2021-07-13 09:52:29 -04:00
Jeff DeCew
ffdbe187a6 Merge "Use SRC_ATOP instead of SRC_IN for blending the NotificationExpandButton" into sc-dev am: d14c60be51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237912

Change-Id: Iab479860b685db90eee761f98d5d450bd8907a4c
 2021-07-13 00:36:19 +00:00
Ahaan Ugale
ab354b6d70 Merge "Check/note ops when delivering HotwordDetectedResult" into sc-dev am: e360fc69a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241921

Change-Id: Ic5d1308896f9b8c1c7c31f17f56b446b855c1115
 2021-07-13 00:34:13 +00:00