Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
632,596 Commits 3 Branches 0 Tags
0f97905040606c3bba2f90d9dba33c16cb76873a
Commit Graph

632596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Mitchell
0f97905040 Merge changes I851f9fb9,I60dbcb24 into sc-dev 
* changes:
  Refactor aapt2 tests ResourceTable changes
  Prepare aapt2 for multiple ids per type
 2021-03-29 20:04:00 +00:00
Jay Aliomer
74d4d02977 Merge "Inline reply multiline + notif pill" into sc-dev 2021-03-29 19:49:42 +00:00
TreeHugger Robot
06af0988dd Merge "Revert "Shortcut integration with AppSearch (Part 6)"" into sc-dev 2021-03-29 19:40:52 +00:00
Yuri Lin
e0d692833e Merge "Delete deleteConversationNotificationChannels from NotificationManagerService." into sc-dev 2021-03-29 19:39:25 +00:00
Jeff DeCew
2ea75ab9ce Merge "Fix color filter on NotificationExpandButton's chevron" into sc-dev 2021-03-29 19:20:15 +00:00
Automerger Merge Worker
10d69bfdce Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b56d7a6e98 -s ours" into rvc-qpr-dev-plus-aosp am: 22e2e81051 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01e0faf8bb511c398e158d52f1d8e219ecc61e70
 2021-03-29 19:14:46 +00:00
Automerger Merge Worker
40e37e117b Merge "Merge "Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0aa am: c644182c1e" into rvc-qpr-dev-plus-aosp am: 684c42187b" into sc-dev 2021-03-29 19:14:38 +00:00
Colin Cross
55e909d41f Merge "Add package.html files to services metalava stubs" into sc-dev 2021-03-29 19:14:24 +00:00
Automerger Merge Worker
b69d8105d1 Merge "Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0aa am: c644182c1e" into rvc-qpr-dev-plus-aosp am: 684c42187b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653203

Change-Id: Ib4f30b4f32a62fbeb982a183fca9b1c4e130e37f
 2021-03-29 19:14:11 +00:00
Automerger Merge Worker
d1abb26f2f Merge "Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev am: d50ed0e726" into rvc-qpr-dev-plus-aosp am: c601013dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13998516

Change-Id: Ib2002d16ca0dbe07a45f688cb8fec4c6a1b3d793
 2021-03-29 19:13:07 +00:00
Nathan Harold
a79ee5c947 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687 am: 0a247cb555 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: Id6a1712a1522ea767c93d423fd95d35bf5ab9cac
 2021-03-29 19:11:07 +00:00
Steven Moreland
dffcfd90c9 Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d am: 615236ca66 am: d99097637f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649648

Change-Id: I9b247f6b3372f1babb19505bd67d026a279b5ec3
 2021-03-29 19:08:45 +00:00
Mustafa Emre Acer
7c4f635b3b Merge "Expose TimeManager.suggestExternalTime()" into sc-dev 2021-03-29 18:46:59 +00:00
Winson Chiu
0906f735dc Merge "Enable SETTINGS_API_V2" into sc-dev 2021-03-29 18:44:51 +00:00
Automerger Merge Worker
22e2e81051 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b56d7a6e98 -s ours" into rvc-qpr-dev-plus-aosp 2021-03-29 18:42:02 +00:00
Automerger Merge Worker
684c42187b Merge "Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0aa am: c644182c1e" into rvc-qpr-dev-plus-aosp 2021-03-29 18:41:36 +00:00
TreeHugger Robot
2195792024 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b56d7a6e98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66185b1296666ec4f5a84bef3e02ecf6f0d5b493
 2021-03-29 18:41:35 +00:00
Automerger Merge Worker
c601013dcd Merge "Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev am: d50ed0e726" into rvc-qpr-dev-plus-aosp 2021-03-29 18:41:28 +00:00
Steven Moreland
0cdc4d0d95 Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0aa am: c644182c1e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653203

Change-Id: I7cdd70fbf6b2699644466f320b5aa6da3803e820
 2021-03-29 18:41:22 +00:00
Myles Watson
23de685a10 Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev am: d50ed0e726 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13998516

Change-Id: I6607e98eeae30160647e9de72f1764090f440e50
 2021-03-29 18:41:09 +00:00
Nathan Harold
0a247cb555 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c am: 365c6b6687 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: I16d744757e26f3cfb0a06ca3f618874dfc221bd4
 2021-03-29 18:41:00 +00:00
Steven Moreland
c644182c1e Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653203

Change-Id: I7c49612cbfcc84368d4cbb1fdbf89c99adae3641
 2021-03-29 18:25:23 +00:00
Sudheer Shanka
624f4c5274 Merge "Add API to allow apps with location permission to access data blobs." into sc-dev 2021-03-29 18:25:11 +00:00
TreeHugger Robot
b56d7a6e98 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-29 18:23:57 +00:00
Steven Moreland
d99097637f Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d am: 615236ca66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649648

Change-Id: Ibb904c21a845199a7e66c592d5ab2c8e191c97f0
 2021-03-29 18:22:24 +00:00
Nathan Harold
365c6b6687 Merge changes from topic "telephony-background-cb" am: f3a83b6c9c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653202

Change-Id: Idb601ea0f49f0a027f54e41dfa139c6589b89987
 2021-03-29 18:22:21 +00:00
Steven Moreland
1f4ac9e0aa Merge "split packagemanager_aidl from libbinder_aidl" 2021-03-29 18:20:29 +00:00
Myles Watson
d50ed0e726 Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev 2021-03-29 18:08:21 +00:00
Nathan Harold
f3a83b6c9c Merge changes from topic "telephony-background-cb" 
* changes:
  Add a Compat Flag for Throwing For Null Telephony
  Ensure Async APIs receive callbacks
 2021-03-29 17:58:41 +00:00
Sudheer Shanka
05f75c2553 Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: 433c866186 am: 4b3348f115 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550

Change-Id: Ic5c9fb2603a010976bc93e5059e5548ee782005e
 2021-03-29 17:45:42 +00:00
Steven Moreland
615236ca66 Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649648

Change-Id: Id5fc627c5b0e28c44176ee89f4b3d6574a52b81d
 2021-03-29 17:41:26 +00:00
Ryan Mitchell
1d008d1d2a Refactor aapt2 tests ResourceTable changes 
This changes refactors tests to use the NewResourceBuilder class
that makes it easier to construct resource entries.

Bug: 183102797
Test: aapt2_tests
Change-Id: I851f9fb99a003769f8df8c1876997eee0864822a
 2021-03-29 10:22:10 -07:00
Ryan Mitchell
9634efb6f4 Prepare aapt2 for multiple ids per type 
For the SDK finalization changes, aapt2 must be able to handle
resources of the same type having different type ids. The
ResourceTable data structure currently stores package ids and type ids
on ResourceTablePackage and ResourceTableType respectively. This
prevents resource entries of the same type from having different type
ids without having to create another ResourceTableType structure.

JavaClassGenerator assumes each type only appears once in the
ResourceTable and it would need to dedupe the types to ensure one class
containing all the resource types ids is generated. TableFlattener on
the other hand needs a separate ResourceTableType for each type/id
combination so that the types are flattened into separate
ResTable_types.

This change simplifies aapt2's ResourceTable data structure:
- Resource ids are stored exclusively on ResourceEntry structures
  meaning multiple entries can have different type ids while being
  stored in the same ResourceTableType. Classes like JavaClassGenerator
  can simply iterate over a type to see all the resources of the type
  regardless of what their type id is.

- ResourceTable::GetPartitionedView() retrieves a list of resources
  sorted and partitioned by package id, type id, and entry id. Classes
  like TableFlattener can use this view to get separate
  ResourceTavleTypes for each different type id that a type has.

These changes will also make it easy to have a resource span multiple
type ids if it exhausts all of the entry ids in one type id.

The new NewResourcesBuilder replaces the numerous setter methods on
ResourceTable.

Bug: 183102797
Test: aapt2_tests
Change-Id: I60dbcb24143bb958333899cafa7d41faa226d203
 2021-03-29 10:22:08 -07:00
Yuri Lin
c5f668e141 Delete deleteConversationNotificationChannels from NotificationManagerService. 
This method isn't used anywhere and its functionality is superseded by onConversationRemoved, which handles deleted conversations.

Test: atest NotificationManagerServiceTest
Bug: 169349809

Change-Id: Iad7f592e71ecf425930e31873088a02e298380b3
 2021-03-29 17:20:36 +00:00
Bill Yi
1dcd953f6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic2475c928d7d6079e7ae6e6588f011ab33f7ed98
 2021-03-29 17:14:32 +00:00
Richard Ho
2335acd9a2 Merge changes from topic "nearby-streaming-policy" into sc-dev 
* changes:
  Add policy for nearby app streaming
  Add policy for nearby notification streaming
 2021-03-29 17:12:03 +00:00
Steven Moreland
5fdf93fc9d Merge "Keystore 2.0: Update to canonical service name." 2021-03-29 17:02:31 +00:00
Sudheer Shanka
4b3348f115 Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: 433c866186 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550

Change-Id: I354cd41d18cfab87b1302d2dbd0ba5dcd10edca6
 2021-03-29 16:57:17 +00:00
Kweku Adams
e3585e106f Merge "Log EJ status to statsd." into sc-dev 2021-03-29 16:21:48 +00:00
Kweku Adams
5edea1db06 Merge "Remove NetworkPolicyManager listener." into sc-dev 2021-03-29 16:21:13 +00:00
Sudheer Shanka
433c866186 Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550

Change-Id: Ia95b11bcf91f18338b26146f6bb9488861555303
 2021-03-29 16:19:05 +00:00
Jay Aliomer
9e3bc4043f Inline reply multiline + notif pill 
Bug: b/182577304
Bug: b/181048615
Fixes: b/183646293
Test: manually test notifications
Change-Id: If2568cb445a3d1c458bbe5ee1fe7d61e6ffa87a8
 2021-03-29 16:08:12 +00:00
Sudheer Shanka
9cff99d059 Merge "Remove NetworkPolicyManager.isUidBlocked() API." 2021-03-29 15:49:15 +00:00
Lucas Dupin
10c1b4f3f9 Merge "Add luma capabilities to ColorStateList" into sc-dev 2021-03-29 15:47:05 +00:00
Jordan Demeulenaere
4f7a421069 Merge "Revert "Swipe notification to edge of screen"" into sc-dev 2021-03-29 15:28:37 +00:00
Joanne Chung
2e3ea6a2ab Merge "Add translation APIs for virtual views." into sc-dev 2021-03-29 15:28:23 +00:00
Winson
9b1cbd6f2b Enable SETTINGS_API_V2 
With the Settings screen now merged, this must be enabled by default
so users can approve domains for apps.

Bug: 183940468

Test: manual, try change on lower targetSdk app

Change-Id: I01c3cf16eae8e8addfd4fca58be99165edeee6e7
 2021-03-29 08:11:14 -07:00
Junyu Lai
18d2238fa1 [automerger skipped] Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4 am: 37dcb82631 am: fc5e6eded5 -s ours 
am skip reason: skip tag Change-Id I073934f3ac4d13b569ea3a295692c76451b7bbfa with SHA-1 5acc19c9ad is already in history

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

Change-Id: Iaccf6206d27f5cd1adf9a348deb9da58829c38b9
 2021-03-29 15:01:10 +00:00
Jeff DeCew
a29c7b91a6 Fix color filter on NotificationExpandButton's chevron 
Bug: 181048615
Test: visual
Change-Id: I7a9a9943e091f8a60b9a77836a946a38f5b570d6
 2021-03-29 10:55:20 -04:00
Jacqueline Bronger
2873f10133 Merge changes from topic "leanback_dialog_background" into sc-dev 
* changes:
  Change leanback dialog backgrounds.
  Remove light leanback dialog themes.
 2021-03-29 14:46:14 +00:00