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

590673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jacky Kao
06cb4221e8 Merge "Fix the focus not move to the place where the finger clicks" 2020-11-05 07:51:28 +00:00
James Mattis
f236a8124b Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82 am: d4313a6d0f am: 632960f643 am: 52717cf3f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487452

Change-Id: I3f6ba3a835372b423c9edd4c9a986189b1b59039
 2020-11-05 06:51:26 +00:00
Chalard Jean
f36fefc6a3 Merge "Move module utils to the module package." 2020-11-05 06:45:18 +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
Jacky Kao
bc96e7ef33 Fix the focus not move to the place where the finger clicks 
User does the triple tap operation, but the gesture detection
becomes to doubleTapAndHold because the timing of the motion
event. Then the long pressing data is created but not be cleared
when the state returns to STATE_CLEAR.
Adding the long pressing data reset to fix this issue.

Bug: 163298552
Test: a11y CTS & unit tests

Change-Id: I5fc23a14b0a4ae3c7c012cb4ed8dc924c00e7fe9
 2020-11-05 13:26:55 +08: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
TreeHugger Robot
8e93277337 Merge "Increase StartInputHistory entry size" 2020-11-05 05:11:25 +00:00
Bill Yi
41de637564 [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: d58cc389e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9a9c0b904a7491a785cdb40dbf2225977a409d7
 2020-11-05 04:57:18 +00:00
Bill Yi
38d71e2e01 [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: 54048deff4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2c75d5261b7f5d85222741354efcccc2146c51f
 2020-11-05 04:56:58 +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
TreeHugger Robot
fc508f3432 Merge "Don't reparent stack created by organizer." 2020-11-05 04:12:35 +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