Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calin Juravle
853d5424b9 Merge "EventSequenceValidator: Only record the debug log in debugging level." into rvc-dev am: 40b9f0967e am: 8261481ec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188947

Change-Id: Ic81839bc76d72a8e313f8452801cc4ea3d25931b
 2020-07-22 19:48:13 +00:00
Calin Juravle
4adfceb688 Merge "EventSequenceValidator: Only record the debug log in debugging level." into rvc-dev am: 40b9f0967e am: 9d20d84d58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188947

Change-Id: Ibf05916886342a5ca1294bf20a66abddffc0f272
 2020-07-22 19:47:54 +00:00
Shuo Qian
612715dbab Merge "Add permission QUERY_ALL_PACKAGES into WAPPushManager" am: 059739f34a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370380

Change-Id: Ia1aea2651a65001d2acb21046777beedf48cda3d
 2020-07-22 19:36:54 +00:00
Shuo Qian
059739f34a Merge "Add permission QUERY_ALL_PACKAGES into WAPPushManager" 2020-07-22 19:31:53 +00:00
vichang
226e3d7641 Merge "Remove @CorePlatformApi LocaleData usage in frameworks" am: 3f89b904a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367376

Change-Id: Ic04cac39c009ec6acc362c8ef84fc52876535dd4
 2020-07-22 19:30:18 +00:00
Calin Juravle
8261481ec8 Merge "EventSequenceValidator: Only record the debug log in debugging level." into rvc-dev am: 40b9f0967e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188947

Change-Id: Ib8ba8ae4e0d0f073cb526ef4be6a56b62faa9e06
 2020-07-22 19:29:34 +00:00
Calin Juravle
9d20d84d58 Merge "EventSequenceValidator: Only record the debug log in debugging level." into rvc-dev am: 40b9f0967e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188947

Change-Id: Iab5859eec58a0706ce5973b2b54bb8730b5b065f
 2020-07-22 19:29:31 +00:00
vichang
3f89b904a8 Merge "Remove @CorePlatformApi LocaleData usage in frameworks" 2020-07-22 19:13:44 +00:00
Calin Juravle
40b9f0967e Merge "EventSequenceValidator: Only record the debug log in debugging level." into rvc-dev 2020-07-22 19:09:02 +00:00
Elliott Hughes
08407fefe5 [automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee am: ff2b9d5cb4 -s ours am: dfa3917c27 -s ours 
am skip reason: Change-Id I86436f287d0e25d1dfae95b915beb78c88dccce2 with SHA-1 7adf08740f is in history

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

Change-Id: I42e9c55d7d046e1455fc9a97a4e2e933f5a28e03
 2020-07-22 18:12:24 +00:00
Anton Hansson
5fee124a21 [automerger skipped] Merge "Add bp-based disting of android stubs" am: 6b54515b61 am: 3f54a52cc3 -s ours am: fa06d8c994 -s ours 
am skip reason: Change-Id Id54507e297b5c57d1ce58f14eb347e7661a5328d with SHA-1 d116c60383 is in history

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

Change-Id: I2f8d8b94fba065d9f48efcb4d3bae3b94b81dbe5
 2020-07-22 18:10:43 +00:00
Jing Ji
3bda3bf8c6 Java docs update: Advise not to include PII in setProcessStateSummary 
Bug: 161812603
Test: m -j offline-sdk-docs & manual verify the javadoc
Change-Id: I741bbf7b83badcd7f1610f31bbd41a49b8b975fb
 2020-07-22 11:03:30 -07:00
Shuo Qian
cb1c40c826 Add permission QUERY_ALL_PACKAGES into WAPPushManager 
Test: Sanity
Bug: 161319976
Change-Id: I931c5a7c5e9c5ee3fd72fa2c0a29df48073fd90c
Merged-In: I931c5a7c5e9c5ee3fd72fa2c0a29df48073fd90c
(cherry picked from commit 11bbbee915)
(cherry picked from commit 647d9fb723)
 2020-07-22 17:59:05 +00:00
Elliott Hughes
dfa3917c27 [automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee am: ff2b9d5cb4 -s ours 
am skip reason: Change-Id I86436f287d0e25d1dfae95b915beb78c88dccce2 with SHA-1 7adf08740f is in history

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

Change-Id: I582872307553ad85854541cf42e684ba7712917b
 2020-07-22 17:54:17 +00:00
Anton Hansson
fa06d8c994 [automerger skipped] Merge "Add bp-based disting of android stubs" am: 6b54515b61 am: 3f54a52cc3 -s ours 
am skip reason: Change-Id Id54507e297b5c57d1ce58f14eb347e7661a5328d with SHA-1 d116c60383 is in history

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

Change-Id: I5db464913cba2e1964be38a3695d87493f94fbc3
 2020-07-22 17:53:46 +00:00
Elliott Hughes
ff2b9d5cb4 Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360733

Change-Id: I920005c586557faa6b5d7b614506593673ddcfad
 2020-07-22 17:33:38 +00:00
Anton Hansson
3f54a52cc3 Merge "Add bp-based disting of android stubs" am: 6b54515b61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1368436

Change-Id: I7120ce6cc0c235f60476e0cb9bb5362a42f14a65
 2020-07-22 17:32:13 +00:00
Elliott Hughes
4a724fc1ee Merge "Remove the watchdog's fd tracker." 2020-07-22 17:15:46 +00:00
Anton Hansson
6b54515b61 Merge "Add bp-based disting of android stubs" 2020-07-22 17:12:42 +00:00
Leon Scroggins III
f663182d52 Update graphics language to comply with Android’s inclusive language guidance 
Bug: 161896447
Test: make

See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: I57b81fb5fd2177fbf96f9cc900097f7da1955fca
 2020-07-22 13:00:12 -04:00
Anton Hansson
d361e4cd7b [automerger skipped] Merge "Add explicit dep on services.backup" am: 20b012282e am: 6953bc127b -s ours am: 1dd4f123cf -s ours 
am skip reason: Change-Id Ice2abeb3f4d031cfe15ce919b750d6de59316c1f with SHA-1 7e7fc7201e is in history

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

Change-Id: I3bd33f57952ef701d77bcabc56674adf1bbc6af8
 2020-07-22 16:47:47 +00:00
Anton Hansson
1dd4f123cf [automerger skipped] Merge "Add explicit dep on services.backup" am: 20b012282e am: 6953bc127b -s ours 
am skip reason: Change-Id Ice2abeb3f4d031cfe15ce919b750d6de59316c1f with SHA-1 7e7fc7201e is in history

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

Change-Id: If7d3964a69782b4e4afd819fe5013eadf549b291
 2020-07-22 16:33:32 +00:00
Anton Hansson
a920550096 Add bp-based disting of android stubs 
This used to be done in Make, but with bp-based dist now supporting
tags we can convert these java_library { hostdex: true } libraries
to dist their classes.jar rather than dex jar.

Bug: 161214753
Test: diff results of `m sdk dist`
Merged-In: Id54507e297b5c57d1ce58f14eb347e7661a5328d
Change-Id: Id54507e297b5c57d1ce58f14eb347e7661a5328d
 2020-07-22 16:20:46 +00:00
Anton Hansson
6953bc127b Merge "Add explicit dep on services.backup" am: 20b012282e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370357

Change-Id: Ib26cddaf0cb9236dffa0937fb8b95a2cf3422aea
 2020-07-22 16:11:05 +00:00
Anton Hansson
20b012282e Merge "Add explicit dep on services.backup" 2020-07-22 15:55:41 +00:00
Anton Hansson
b2fb9636b9 Add explicit dep on services.backup 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Test: m RunFrameworksServicesRoboTests
Change-Id: Ice2abeb3f4d031cfe15ce919b750d6de59316c1f
Merged-In: Ice2abeb3f4d031cfe15ce919b750d6de59316c1f
 2020-07-22 15:38:33 +01:00
Treehugger Robot
14f88702b1 [automerger skipped] Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296 am: 8f6335b3fa -s ours 
am skip reason: Change-Id I9802b8712798054a85307e549fb665bc85166311 with SHA-1 3a3af2fc2f is in history

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

Change-Id: I93b4b9e3787ceebf55aadb7b79e590e5ea31121c
 2020-07-22 10:59:50 +00:00
Treehugger Robot
8f6335b3fa Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367056

Change-Id: I1e1a8a324c441f6992414eeafc99b2cec908982d
 2020-07-22 10:40:06 +00:00
Treehugger Robot
8a84baa296 Merge "Add carrier config for NR timer reset" am: 71b90ae022 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1367056

Change-Id: Ifd504c77fb45ceee458899560e24a8c6e1dbfff7
 2020-07-22 10:17:53 +00:00
Treehugger Robot
71b90ae022 Merge "Add carrier config for NR timer reset" 2020-07-22 10:06:59 +00:00
Anton Hansson
b897b0b7b6 Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp am: c9de0dd4e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202891

Change-Id: I9f5fa89886f5220df89f3f145e2ce06c5a825e9a
 2020-07-22 09:47:13 +00:00
Anton Hansson
c9de0dd4e2 Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp 2020-07-22 09:44:26 +00:00
Automerger Merge Worker
58ff205f6b Merge "Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 am: 52c75a500b" into rvc-d1-dev-plus-aosp 2020-07-22 09:41:51 +00:00
TreeHugger Robot
afafda2626 Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 am: 52c75a500b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: I3abb5638dac8d38d3237304bf94c4c011ce75fb1
 2020-07-22 09:41:39 +00:00
TreeHugger Robot
efc122a820 Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 am: 8c8fa3588d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: Id4e6007456afd963de6ca3c0f9c1c1399028e5ce
 2020-07-22 09:41:27 +00:00
TreeHugger Robot
52c75a500b Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: I5592eaf614f3dfcfbd8ab57550af954cb26c3f8d
 2020-07-22 09:22:51 +00:00
TreeHugger Robot
8c8fa3588d Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: I36d56a7258c7985467032ddd3e896c677562ba91
 2020-07-22 09:22:42 +00:00
TreeHugger Robot
dd4a89ba14 Merge "Fix NavigationBarColorTest" into rvc-dev 2020-07-22 09:13:13 +00:00
Matthew Mintz
0d862123c1 Merge "Remove callbacks and messages in onDestroy()." into rvc-dev-plus-aosp am: e86b1a1574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12202965

Change-Id: I7c4fd257db7b1d7199d79350f7529a3b5fd3eaf2
 2020-07-22 08:36:50 +00:00
Matthew Mintz
e86b1a1574 Merge "Remove callbacks and messages in onDestroy()." into rvc-dev-plus-aosp 2020-07-22 08:27:14 +00:00
Anton Hansson
d116c60383 Add bp-based disting of android stubs 
This used to be done in Make, but with bp-based dist now supporting
tags we can convert these java_library { hostdex: true } libraries
to dist their classes.jar rather than dex jar.

Bug: 161214753
Test: diff results of `m sdk dist`
Change-Id: Id54507e297b5c57d1ce58f14eb347e7661a5328d
 2020-07-22 08:52:21 +01:00
Sergey Nikolaienkov
8c68c6cc7b Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a am: 71f8e0fbc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: I8e36e6ac86d354094f2d0700da8a6f61bac56f5f
 2020-07-22 07:04:07 +00:00
Sergey Nikolaienkov
71f8e0fbc2 Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: Id65701e738cd523032166eb48e1aba052f55defa
 2020-07-22 06:51:45 +00:00
Matthew Mintz
c8eee94e1b Remove callbacks and messages in onDestroy(). 
The Runnable is running after destroying the Cursor, which only happens in onDestroy(). So clean up before that happens.

Bug: 151283186
Test: Built, installed, and set ringtone.
Change-Id: I95c824675e6e710a1dc5d1f8faef2daff6f563e6
Merged-In: I95c824675e6e710a1dc5d1f8faef2daff6f563e6
(cherry picked from commit 2e23b5c013)
 2020-07-22 06:44:31 +00:00
Sergey Nikolaienkov
f453a23f6a Merge "Make Shell require permission for a new CTS test" am: e3548b2259 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702

Change-Id: If1c63eb9bff844be0b35cd2400ff683bd566a239
 2020-07-22 06:39:01 +00:00
Sergey Nikolaienkov
e3548b2259 Merge "Make Shell require permission for a new CTS test" 2020-07-22 06:17:36 +00:00
Taran Singh
588fa46cf4 Fix NavigationBarColorTest 
Manually partially revert I4910c2a06cc67b0470477b245fc1de54b75f10f9 so
that we don't use a window that's animating away as control target.

Fix: 161659326
Bug: 153145997
Test: atest NavigationBarColorTest#testSetNavigationBarColor

Change-Id: I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b
 2020-07-21 17:49:17 -07:00
TreeHugger Robot
a4b6ce3b6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cee8db09e4046199bdc5b54ff7bbdd6556df219
 2020-07-22 00:47:10 +00:00
Automerger Merge Worker
1995e8a35c Merge "Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684" into rvc-d1-dev-plus-aosp 2020-07-22 00:46:56 +00:00
Kevin Hufnagle
87587094db Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I0ef22dd9c5377dd5a42990abce68cc15935ef72d
 2020-07-22 00:46:42 +00:00