Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
559,080 Commits 3 Branches 0 Tags
e7fe523116aced5da61e28a2cd3326dc591e9d9e
Commit Graph

559080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
e7fe523116 Merge "Add support for DTMF and RTP header extension communications." am: 49612b38d8 am: 884d18b7d1 am: b18d3a92c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487449

Change-Id: Id3ccaaa4f6d55d24620711b90e014c4058bba7d9
 2020-11-05 20:06:57 +00:00
Anton Hansson
dc1367d460 resolve merge conflicts of 8e6e52ec8b to rvc-qpr-dev-plus-aosp 
Bug: 171029603
Change-Id: Ie846f5b9bc1ee906fc6f01d05899fddfd1918266
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
 2020-11-05 19:59:32 +00:00
Tyler Gunn
b18d3a92c8 Merge "Add support for DTMF and RTP header extension communications." am: 49612b38d8 am: 884d18b7d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487449

Change-Id: I03747f804f21d434e4f8ddafdc52fe5978318a74
 2020-11-05 18:54:34 +00:00
Jeff DeCew
1f419e4ddf Fix non-dismissible resumption players. am: 36fc7e464e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12995017

Change-Id: Ib55af681e733383c21512f4712e5ea106a4b797e
 2020-11-05 18:43:50 +00:00
Tyler Gunn
884d18b7d1 Merge "Add support for DTMF and RTP header extension communications." am: 49612b38d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487449

Change-Id: I881bdd65e5ca5b9f2da8915523d9b47f420d3799
 2020-11-05 18:36:03 +00:00
Anton Hansson
8e6e52ec8b Merge "Move testapi API files for symmetry with others" am: 78d5048610 am: b6177fc464 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488697

Change-Id: Id5e5d7d3a0eadbcd6183716a429f5b9849fef7fa
 2020-11-05 18:29:45 +00:00
Tyler Gunn
49612b38d8 Merge "Add support for DTMF and RTP header extension communications." 2020-11-05 17:57:40 +00:00
Anton Hansson
b6177fc464 Merge "Move testapi API files for symmetry with others" am: 78d5048610 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488697

Change-Id: Ib3372ff7001df05aaeb96664c7531348854740be
 2020-11-05 17:42:02 +00:00
Anton Hansson
78d5048610 Merge "Move testapi API files for symmetry with others" 2020-11-05 17:23:24 +00:00
Jeff DeCew
36fc7e464e Fix non-dismissible resumption players. 
Ensure resumption players created when a non-dismissible notification
is cancelled force the 'isClearable' flag to true. This fixes a bug
where a resumption player is non-dismissable.

Test: manual - Finish item in Pocket Casts, attempt long-press dismiss.
Bug: 169271494
Change-Id: I186f9ee6fc228ad5bd1d49970fb44709783b74dc
Merged-In: I186f9ee6fc228ad5bd1d49970fb44709783b74dc
(cherry picked from commit 656e986464)
 2020-11-05 17:08:20 +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
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
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
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
552ba2c492 Move testapi API files for symmetry with others 
The other non-updatable API files are in core/api/*. Also add
-non-updatable to the module to match the others.

Bug: 171029603
Test: m checkapi
Change-Id: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
(cherry picked from commit 3a1b1bd620454dd1d5b328c98634a567865cd55e)
 2020-11-05 14:04:24 +00:00
Anton Hansson
3ab2ebfe26 Merge "Make current-api-xml use generated current.txt" 2020-11-05 13:52:54 +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
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
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
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
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
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
Anton Hansson
fd4bcbd76a Merge "Remove unused monolithic jars" 2020-11-05 09:50:23 +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
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
Paul Hu
a1c0a06580 Merge "Replace Context @hide APIs" 2020-11-05 08:05:09 +00:00
Paul Hu
a80bc72775 Merge "Replace AppOpsManager @hide APIs" 2020-11-05 08:03:55 +00:00
Paul Hu
01bec3bb2b Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" 2020-11-05 07:55:10 +00:00
James Mattis
52717cf3f0 Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: d4313a6d0f am: 632960f643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I49522105e82ee2d63fd84f7ab56fb3e11d87b5c7
 2020-11-05 06:00:08 +00:00
James Mattis
632960f643 Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: d4313a6d0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: Ic5b96ccbba713327c70a62ba584129ab20f35db6
 2020-11-05 05:49:10 +00:00
James Mattis
d4313a6d0f Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I92bd7437dede4ae4a4bb27dfbf68a5ae74553811
 2020-11-05 05:24:33 +00:00
James Mattis
df86206d82 Merge "Adding @IgnoreUpTo for testOemPrivate" 2020-11-05 04:31:51 +00:00
Bill Yi
d58cc389e4 [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a am: e666aa1e3d -s ours am: 64363d8b8d -s ours 
am skip reason: Change-Id Ic1e07d28a41eea2ce59cc21702dae95d61adc24e with SHA-1 0c5a020adc is in history

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

Change-Id: Iaeedaf3983f8e900a5ac08c74eed21809954e1e3
 2020-11-05 04:21:06 +00:00
Bill Yi
54048deff4 [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f2d4156f5b am: c847e318a5 -s ours am: 996fbcaba3 -s ours 
am skip reason: Change-Id Ic1e07d28a41eea2ce59cc21702dae95d61adc24e with SHA-1 0c5a020adc is in history

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

Change-Id: I5ee9e9d9b2c1c930b9185d0499dc5b7236fe6ea8
 2020-11-05 04:20:59 +00:00
Bill Yi
64363d8b8d [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a am: e666aa1e3d -s ours 
am skip reason: Change-Id Ic1e07d28a41eea2ce59cc21702dae95d61adc24e with SHA-1 0c5a020adc is in history

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

Change-Id: If6eb17c8b328ea801a2825e93391a9bd21925072
 2020-11-05 04:01:16 +00:00
Bill Yi
996fbcaba3 [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f2d4156f5b am: c847e318a5 -s ours 
am skip reason: Change-Id Ic1e07d28a41eea2ce59cc21702dae95d61adc24e with SHA-1 0c5a020adc is in history

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

Change-Id: I308d5ffd773643410d45a069e4ffcb4cf6b8b375
 2020-11-05 04:01:10 +00:00
Bill Yi
e666aa1e3d Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068

Change-Id: I2a77e6a9e5246800149980d33b19fca17fc687b6
 2020-11-05 03:13:30 +00:00
Bill Yi
c847e318a5 Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f2d4156f5b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068

Change-Id: I8a4f97f07e021357299d524adbd155a4ea453588
 2020-11-05 03:01:07 +00:00