Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
656,324 Commits 3 Branches 0 Tags
fb0e399e7b72cbb580895365a06cfbc2a5d69e39
Commit Graph

16584 Commits

Author SHA1 Message Date
Dmitri Plotnikov
58214c18dd Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 am: e69a707085 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: Iedc246526e371342096d6e3354b0e742bd4c855c
 2021-09-10 18:56:26 +00:00
Dmitri Plotnikov
e69a707085 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 am: cc225325e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: I531bd2c8da470bbde94135dfdddc425de5dbbf9c
 2021-09-10 18:41:20 +00:00
Dmitri Plotnikov
cc225325e3 Merge "Add OWNERS for BatteryStats related files" am: a84bdc93a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822145

Change-Id: If3cc87baf6a2249634e3f35ea8683177d9ace1c9
 2021-09-10 18:20:32 +00:00
Dmitri Plotnikov
9fca835a97 Add OWNERS for BatteryStats related files 
Test: N/A

Change-Id: I6b17062eaf538849389528619067504f18e7b2ab
 2021-09-09 18:24:17 -07:00
Michael Wachenschwanz
493f8b0569 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev am: b85b750561 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15756344

Change-Id: I6eb80336c52e2046180802d6813c7e9dafb92e47
 2021-09-09 23:54:45 +00:00
Michael Wachenschwanz
b85b750561 Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev 2021-09-09 23:35:40 +00:00
Wu Ahan
7afe2f3723 Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: Ia24326d6b43ca86e46511ebdaaee9718af701e98
 2021-09-09 16:04:08 +00:00
Wu Ahan
819d63139f Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: db108bdf5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: Ib41b1c0347d440c0537ee157fe03327a03a1e3d2
 2021-09-08 12:32:54 +00:00
Wu Ahan
db108bdf5f Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: I8e7f11c28c9e76702f422e5153d250f5750e8138
 2021-09-08 12:22:40 +00:00
Michael Wachenschwanz
b028aa01c6 Ref count isolated uid usage in BatteryStats 
Wakelock tracking in BatteryStats relies on the the isolated uid map
when tracking wakelocks from isolated uids. The map needs to keep the
isolated uid while it still has a  wakelock.

Bug: 194414351
Test: atest BatteryStatsNoteTest
Change-Id: I5e51f5f90191829d12fb080169520d9827b9906c
(cherry picked from commit 83c0928c34)
Merged-In: I5e51f5f90191829d12fb080169520d9827b9906c
 2021-09-07 22:47:21 +00:00
Hall Liu
f4fe3ac665 Update and expose ModemActivityInfo 
Update ModemActivityInfo to present a nicer API surface and expose it as
a SystemApi. Also change clients in BatteryStats to match the new
surface.

This is part 1. Part 2 will modify the methods in TelephonyManager to
use a more up-to-standards threading model.

Bug: 170427831
Test: atest ModemActivityInfoTest
Change-Id: I762ed949342861c75d94eafce88335e7bd8c9139
Merged-In: I762ed949342861c75d94eafce88335e7bd8c9139
 2021-09-07 11:40:55 -07:00
Ahan Wu
59e29276f9 Make sure the removeObservers be called correctly 
Handle the surface destroyed case and add a timeout for finish call.

Bug: 196171638
Bug: 197555842
Test: adb shell dumpsys SurfaceFlinger
Test: check the offscreen layers
Test: see 198714745#comment6
Change-Id: Ic6d2521d788c50e10b81b556849194a97f240376
Merged-In: Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c
 2021-09-07 08:44:16 -08:00
Treehugger Robot
0fa9d2ef6b Merge "Add suppressLintAnnotation on state.java" 2021-09-07 15:51:39 +00:00
wescande
4d65834880 Add suppressLintAnnotation on state.java 
Test: Build
Merged-In: I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f
Change-Id: I5a22ebe6473fbf38494e20d629e763c331b1e1e6
 2021-09-07 16:43:09 +02:00
Treehugger Robot
0ee62e910b Merge "create library for mainline module" am: c59870928e am: 26531301a0 am: eeecbc866f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: If4d803fb10b4fe5f77b308200ed93fd43681190e
 2021-09-07 14:33:34 +00:00
Treehugger Robot
eeecbc866f Merge "create library for mainline module" am: c59870928e am: 26531301a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: Ic3137a8521f0cca651292a9a56cddde54a138ea7
 2021-09-07 14:21:56 +00:00
Treehugger Robot
26531301a0 Merge "create library for mainline module" am: c59870928e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818896

Change-Id: I048c27593314c00706f29db19b6d20ed4b899ae2
 2021-09-07 14:00:18 +00:00
William Escande
a6fb9459cc create library for mainline module 
This library is a temporary work to link all mainline module using
statemachine.
Once this is done, we will be able to move the library to
frameworks/libs/modules-utils

also fix some typo in state* files

Bug: 198418216
Tag: #refactor
Test: None
Change-Id: I1bec7c7bdb25bf3397a742a356aa1f18fddf7d89
 2021-09-06 15:28:09 +00:00
Joe Bolinger
02eb16d887 Merge changes from topic "more-cancel-sc-qpr1-dev" into sc-qpr1-dev am: 16a7d2e7bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727904

Change-Id: Id9964610269328c04806b44d10b9bb555b1f63e0
 2021-09-01 22:23:39 +00:00
Joe Bolinger
bdd477a5d1 Add requestId to authentication entry points. 
The CancellationSignal passed into the authentication methods is not
associated with the request and can be used to cancel the current
operation, even if it is more recent. The new id prevents outdated
signals from being using.

Note that there are still issues with the Callbacks that are not
addressed (see bug for details).

Bug: 194405579
Bug: 189451155
Bug: 191716671
Test: atest com.android.systemui.biometrics com.android.server.biometrics

Change-Id: Id71be912cc88ae90df8087eb8f1a6fc3e110f883
 2021-09-01 08:49:26 -07:00
Daniel Norman
fd9b35d4de Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 am: 2b3dbdd95b am: d0c69c2298 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683

Change-Id: Id1e4ac300e6cd25369a092285fc28d0576e0d96c
 2021-08-30 19:49:24 +00:00
Daniel Norman
d0c69c2298 Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 am: 2b3dbdd95b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683

Change-Id: I1f429e9506dc522cc29d3b4ecba8b33d6982eb55
 2021-08-30 19:32:25 +00:00
Daniel Norman
2b3dbdd95b Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683

Change-Id: I2385e0b45e15f204382ec5eeee24ce3d62b17064
 2021-08-30 19:11:58 +00:00
Daniel Norman
ada5fb65b5 Merge "Allow APEXes permission XMLs to declare features." 2021-08-30 19:09:21 +00:00
Daniel Norman
5f0797723c Allow APEXes permission XMLs to declare features. 
This allows APEXes to include permission XMLs like the NFC XMLs in
frameworks/native/data/etc which declare NFC features.

(This also enables `unavailable-feature` declarations.)

Bug: 197680726
Test: Include an NFC permission XML in an APEX.
      Observe feature is set correctly in logs and by
      enabling NFC in Settings app.
Change-Id: Ied425b8897ab80df250d42cfbf0525634ed948aa
 2021-08-26 11:57:23 -07:00
Orion Hodson
868634f0bb Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc am: b55a7938a6 am: f08df3a589 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: I344c6a25a3a0f20bdc825107c4bc11142713b2ea
 2021-08-26 15:21:28 +00:00
Orion Hodson
f08df3a589 Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc am: b55a7938a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: I4101218b669feb79235c469013693752c9bca8f8
 2021-08-26 15:08:11 +00:00
Orion Hodson
b55a7938a6 Merge "Drop system_server dexopt in ZygoteInit" am: 5e1c9fe7fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806016

Change-Id: Icf16da811d100df9dcc6c91a2fa9b2e4a76f9654
 2021-08-26 14:51:20 +00:00
Orion Hodson
5e1c9fe7fc Merge "Drop system_server dexopt in ZygoteInit" 2021-08-26 14:35:24 +00:00
Jooyung Han
8643edb8f2 Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f am: 7c15aa4254 am: 43fa5417b7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1808127

Change-Id: I217cca39ff0466e8c99115745335c6cc4effc96b
 2021-08-26 00:44:51 +00:00
Jooyung Han
43fa5417b7 Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f am: 7c15aa4254 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1808127

Change-Id: I222e33a7e88f0301f2b357197d34bddd95132d19
 2021-08-26 00:32:01 +00:00
Jooyung Han
7c15aa4254 Merge "telephony: suppress warnings in AIDL" am: 6dff9dce0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1808127

Change-Id: I26c3e6899c9126f54e8914997f347ebb34654ef6
 2021-08-26 00:15:42 +00:00
Jooyung Han
e53a76adec telephony: suppress warnings in AIDL 
This was missed in 133879b683.

Emergency number list is internally represented as Map<Integer,
List<EmergencyNumber>>, which is not supported by AIDL.

Bug: 192615532
Test: m
Change-Id: I5dc8b0f94b13b6625bb31933c6488dc87c9db713
 2021-08-25 15:17:56 +09:00
Neha Jain
5de7be4e77 Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 am: a3c93f8051 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

Change-Id: I17d920ef3a0b62cbbd3ba58a05370116f17f21aa
 2021-08-24 18:21:18 +00:00
Neha Jain
a3c93f8051 Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

Change-Id: If8bd68e45a257fbc97df53392db9ddeba784df03
 2021-08-24 18:20:22 +00:00
Neha Jain
5d29a96cab Merge "ims: Version support for uce feature tags" into sc-dev am: d446e80289 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515803

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

Change-Id: If65518b6c220614e35bd8e873facd66c13a89c76
 2021-08-24 17:45:45 +00:00
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
Pavan Kumar M
6624e2aa57 ims: Version support for uce feature tags 
Add version support for uce feature tags

Bug: 175092320
Bug: 193992611
Bug: 193543670
Change-Id: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
 2021-08-24 01:39:55 +00:00
Orion Hodson
c3e8e916eb Drop system_server dexopt in ZygoteInit 
system_server artifacts should be present in the system image or
generated by on-device signing.

Bug: 187711479
Fix: 163019104
Test: m & boot
Change-Id: I19094e1a60b903d04cf7ba23e65cc9ef10f7f243
 2021-08-23 10:52:41 +01:00
Jeff DeCew
2de4373e93 Merge changes I09b3999a,I590be0ba into sc-qpr1-dev am: 10c7e2b811 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549414

Change-Id: I09ff92b8debe78859e621fd6ac013d8281959d07
 2021-08-16 19:38:06 +00:00
Jeff DeCew
10c7e2b811 Merge changes I09b3999a,I590be0ba into sc-qpr1-dev 
* changes:
  Use tertiary accent color for expander with unread count.
  Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color
 2021-08-16 19:21:18 +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
Jeff DeCew
4c0e8a62e6 Fix ContrastColorUtil.findContrastColorAgainstDark to return the valid color 
Fixes: 196600502
Test: atest ContrastColorUtilTest
Change-Id: I590be0ba30c03e867bf08558483239818b3aff82
 2021-08-16 14:14:53 +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
Jeff DeCew
e30260aa9a Merge "Collapse the CallStyle buttons to just an icon instead of truncating text." into sc-qpr1-dev am: 44527690ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559241

Change-Id: Ib93a57b8bd4e2158f2edbd87a552de2db49d8032
 2021-08-14 02:17:17 +00:00
Jeff DeCew
7ce358c005 Collapse the CallStyle buttons to just an icon instead of truncating text. 
Fixes: 195019654
Test: post CallStyle notification without custom action; observe text
Test: post CallStyle notification with custom action; observe buttons shrink to icon only.
Test: repeat tests using various font and screen sizes.
Change-Id: Icbd6189a1e03494e481e8672263570ae2657f946
 2021-08-13 15:52:48 +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