Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
590,696 Commits 3 Branches 0 Tags
6dd4d3115143bf01158d2ecd88709bbc8ad2b226
Commit Graph

590696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
6dd4d31151 Merge "Ability to configure NR dual connectivity" am: aa756e198c am: d54065a670 am: 0589ecb8ce am: 72f2a2c52a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486306

Change-Id: I412cad98f0f32017ca4c44a8686e76cbfc5e7c5c
 2020-11-05 16:24:15 +00:00
Jin Seok Park
ed942b0cd9 Merge "Expose remote volume controller-related APIs" 2020-11-05 16:22:12 +00:00
Treehugger Robot
72f2a2c52a Merge "Ability to configure NR dual connectivity" am: aa756e198c am: d54065a670 am: 0589ecb8ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486306

Change-Id: I963cdcb960124643aa12760073dd34351921cd75
 2020-11-05 16:11:33 +00:00
Treehugger Robot
0589ecb8ce Merge "Ability to configure NR dual connectivity" am: aa756e198c am: d54065a670 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486306

Change-Id: I6ee21a34806b4d76f92b6ec042d6c16db81ff971
 2020-11-05 15:55:13 +00:00
Anton Hansson
04774ea1ba Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 am: 18503252ef am: 81a0d7c236 am: c43bbaa053 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Ic88b75609f8c18d0222e9faa3b21b72e61fc4e72
 2020-11-05 15:49:03 +00:00
Treehugger Robot
d54065a670 Merge "Ability to configure NR dual connectivity" am: aa756e198c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486306

Change-Id: I8ca504a542be4443bae344e3522b76373694a67e
 2020-11-05 15:36:17 +00:00
TreeHugger Robot
040f7da5bc Merge "Invoking Assistant on keydown" 2020-11-05 15:35:48 +00:00
Anton Hansson
c43bbaa053 Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 am: 18503252ef am: 81a0d7c236 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Ie0ef20c88773c7ced7c7ef3392eb77f64c040b2d
 2020-11-05 15:30:42 +00:00
Treehugger Robot
aa756e198c Merge "Ability to configure NR dual connectivity" 2020-11-05 15:23:46 +00:00
Anton Hansson
81a0d7c236 Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 am: 18503252ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Ia7302a3940681a3ea128475651e536516121df31
 2020-11-05 14:43:53 +00:00
TreeHugger Robot
94590a89b3 Merge "Notify VPN status from SystemUI as notifications" 2020-11-05 14:35:58 +00:00
Anton Hansson
18503252ef Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Iae67a72df5038a527b2b704fe171c352a70d9bd6
 2020-11-05 14:12:57 +00:00
Anton Hansson
3ab2ebfe26 Merge "Make current-api-xml use generated current.txt" 2020-11-05 13:52:54 +00:00
Anton Hansson
4daa8ebb2a [automerger skipped] Merge "Restrict visibility of framework-module-common-defaults" into mainline-prod am: 512c41b92f -s ours 
am skip reason: Change-Id I32a20de74c29b9fa1a0083bce084896aad99eb41 with SHA-1 7b5929720e is in history

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

Change-Id: Ia576b7e9f3a39e03e49eb66bc0561819ed4fd84f
 2020-11-05 12:29:56 +00:00
Anton Hansson
512c41b92f Merge "Restrict visibility of framework-module-common-defaults" into mainline-prod 2020-11-05 12:10:35 +00:00
Marin Shalamanov
9a19e45b20 Merge "Add flag for match content frame rate" 2020-11-05 12:05:34 +00:00
Nikita Iashchenko
d0fb8ca8aa [automerger skipped] Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef am: bce0208847 am: d5cad5b37b am: c271490863 -s ours 
am skip reason: Change-Id I142a792c34dced6b0e27b867ed3a1d95249a5f7f with SHA-1 98656eef99 is in history

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

Change-Id: I4cc60ffc7e8fa7bf67154f72c1433edd345d8cc4
 2020-11-05 11:29:10 +00:00
Anton Hansson
5ae58eaa35 [automerger skipped] Merge "Remove unused monolithic jars" am: fd4bcbd76a am: dd64b2cbf9 am: 942afe4c9f am: a6fdffee47 -s ours 
am skip reason: Change-Id I7859589b93b861439fb1b7de084e52294da53671 with SHA-1 65aa6ea9d1 is in history

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

Change-Id: I2e908255329cf8485026fa1ea225261359173411
 2020-11-05 11:28:49 +00:00
Nikita Iashchenko
c271490863 Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef am: bce0208847 am: d5cad5b37b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136

Change-Id: I34e7639f6fb4aa3516302d6d63fc74fd632dbcea
 2020-11-05 11:16:07 +00:00
Fiona Campbell
fd9ceb97b4 Merge "Return to using brightness ramp values from config" 2020-11-05 11:16:04 +00:00
Anton Hansson
a6fdffee47 Merge "Remove unused monolithic jars" am: fd4bcbd76a am: dd64b2cbf9 am: 942afe4c9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486198

Change-Id: Ia7eb172d65dfce0be6d87195db8270113059a368
 2020-11-05 11:15:40 +00:00
Santiago Seifert
c45ddb6938 Merge "Address API feedback on setOnRtpRxNoticeListener" 2020-11-05 11:11:58 +00:00
Madhava Srinivasan
bc7cb1e861 Invoking Assistant on keydown 
This change alters the behavior of when Assistant is launched on TV.

Also, removed the "long press" assist behavior and associated logic.

Bug: 117490624
Bug: 134613904
Test: make; ADT-3

Change-Id: I23a9c8f1b440b095b6afeeac2314bc9ecd329400
 2020-11-05 11:01:12 +00:00
Dorin Drimus
3382392f9e Notify VPN status from SystemUI as notifications 
A `VPN is connected.` ongoing notification is sent when connected to a
VPN and a `VPN is disconnected.` short lived notification is send when
disconnected from a VPN.

Test: Manual tests. Connecting and disconnecting to VPNs (from a VPN
client app) show the (undismissable, ongoing) connected and
(dismissable, short lived) disconnected notifications. A CTS test will
be added in a separate CL.
Bug: 157500504

Change-Id: I321dec45127104b5139b9e868bac76b9d882e9f2
 2020-11-05 11:57:35 +01:00
Nikita Iashchenko
d5cad5b37b Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef am: bce0208847 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136

Change-Id: I6afaab8235979ddded27bee84c90fb4277ef19fa
 2020-11-05 10:56:55 +00:00
Anton Hansson
942afe4c9f Merge "Remove unused monolithic jars" am: fd4bcbd76a am: dd64b2cbf9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486198

Change-Id: Ie9cd9660339517ce17cf4c2279781bd04ddaaadf
 2020-11-05 10:56:01 +00:00
Anton Hansson
607e78efc6 Merge "Add SuppressLint to framework-annotations-lib" into mainline-prod am: 7409872469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12973678

Change-Id: I7ea59a70c7740e61078fce7c6e314462427c9970
 2020-11-05 10:55:54 +00:00
TreeHugger Robot
2428e93999 Merge "Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" 2020-11-05 10:38:37 +00:00
arangelov
790348fbf1 Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser 
Test: atest DevicePolicyManagerTest
Test: atest CrossProfileAppsTest
Bug: 153995973
Change-Id: I103c45ea61814e476eea197d357ef0ce75edefdc
 2020-11-05 10:37:00 +00:00
Anton Hansson
00febe2eb6 Make current-api-xml use generated current.txt 
Remove the dep on the monolithic current.txt so that it can be deleted.

Bug: 158465496
Test: m current-api-xml (same before and after)
Change-Id: I6d36801592a20cb9dc8f87c7d9d4babf0986c448
 2020-11-05 10:30:59 +00:00
TreeHugger Robot
5902a6dcb8 Merge "Add tests for TV Pip notification intents" 2020-11-05 10:25:27 +00:00
Nikita Iashchenko
bce0208847 Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136

Change-Id: Ifb6e71163999d084ccc1f7e648d6caea21e8a0c7
 2020-11-05 10:19:49 +00:00
Nikita Iashchenko
97f35bbbef Merge "Import TLS handshake atom for Conscrypt" 2020-11-05 10:14:31 +00:00
Anton Hansson
7409872469 Merge "Add SuppressLint to framework-annotations-lib" into mainline-prod 2020-11-05 10:12:39 +00:00
Anton Hansson
c33bf84579 Merge changes from topic "addsup" 
* changes:
  [automerge] Add SuppressLint to framework-annotations-lib 2p: 2157c89792
  Add SuppressLint to framework-annotations-lib
 2020-11-05 10:12:39 +00:00
Anton Hansson
dd64b2cbf9 Merge "Remove unused monolithic jars" am: fd4bcbd76a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486198

Change-Id: I34a339e974d9369662d23d32aa93e70677f2431f
 2020-11-05 10:08:44 +00:00
Paul Hu
9ff720e716 Merge "Replace Context @hide APIs" am: a1c0a06580 am: d5ee31aba5 am: f4ceac073a am: 349b7e3bd9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: I5241814fffc4ef794c07abca748d650c720576eb
 2020-11-05 09:51:13 +00:00
Paul Hu
1bdf6c9fd6 Merge "Replace AppOpsManager @hide APIs" am: a80bc72775 am: 5e56187d53 am: 22c7f24f4b am: 1d7f371302 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I3edb79a9e05efb0c898a393a7ab98cd9d3305466
 2020-11-05 09:50:51 +00:00
Anton Hansson
fd4bcbd76a Merge "Remove unused monolithic jars" 2020-11-05 09:50:23 +00:00
Paul Hu
ca0ac0d202 Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b am: b8eb5b0ee1 am: b892146fb4 am: d667289cc6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I5b315cd95cd0be59debb75caf9678845b284b666
 2020-11-05 09:50:21 +00:00
Paul Hu
349b7e3bd9 Merge "Replace Context @hide APIs" am: a1c0a06580 am: d5ee31aba5 am: f4ceac073a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: Ib4aae2fd7eebd700928edc2c715df8de90b428a7
 2020-11-05 09:38:40 +00:00
Paul Hu
1d7f371302 Merge "Replace AppOpsManager @hide APIs" am: a80bc72775 am: 5e56187d53 am: 22c7f24f4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: If33de767f397797a104bf2030ac4ca5f8928359f
 2020-11-05 09:38:29 +00:00
Paul Hu
d667289cc6 Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b am: b8eb5b0ee1 am: b892146fb4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: Ibe2ed0ef2cf3e2c654c8a1fca8dc045fc2666f08
 2020-11-05 09:37:59 +00:00
Anton Hansson
65aa6ea9d1 Remove unused monolithic jars 
Nothing depends on these. They were only here for easy comparison
with the merged variant while we ironed out diffs.

Rename the merged variants instead of having duplicate compilation
rules.

Bug: 171029603
Test: m nothing
Change-Id: I7859589b93b861439fb1b7de084e52294da53671
 2020-11-05 09:25:46 +00:00
Paul Hu
f4ceac073a Merge "Replace Context @hide APIs" am: a1c0a06580 am: d5ee31aba5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: Iea56458847be39665e7660f048eec88147be27c3
 2020-11-05 09:14:59 +00:00
Paul Hu
22c7f24f4b Merge "Replace AppOpsManager @hide APIs" am: a80bc72775 am: 5e56187d53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I9548c666d528e025b71f5d3b12b0c5ff2265eb23
 2020-11-05 09:14:46 +00:00
Paul Hu
b892146fb4 Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b am: b8eb5b0ee1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I280d5f807ee40838ab8abe865a3d272e58ce8cbb
 2020-11-05 09:14:16 +00:00
Paul Hu
d5ee31aba5 Merge "Replace Context @hide APIs" am: a1c0a06580 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458063

Change-Id: I914ee12abdcba7c53fb868425592d6458a797e23
 2020-11-05 08:53:01 +00:00
Paul Hu
5e56187d53 Merge "Replace AppOpsManager @hide APIs" am: a80bc72775 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469126

Change-Id: I6222db7e8f966d7df17de9c46b5e26e715ecccf2
 2020-11-05 08:45:52 +00:00
Paul Hu
b8eb5b0ee1 Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I16d87836136f411e61756246817ed448d974bec4
 2020-11-05 08:37:59 +00:00