Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
690,053 Commits 3 Branches 0 Tags
925fa3fe5f4e720dc4de4847fd26a80148060441
Commit Graph

690053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Chin
925fa3fe5f Merge "Update getSubscriptionPlans documentation" am: f3ecc6182b am: 969acb192a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032283

Change-Id: I9844a808e85842c75f19a7153b56ed7dff7ec316
 2022-03-18 22:11:42 +00:00
Sarah Chin
969acb192a Merge "Update getSubscriptionPlans documentation" am: f3ecc6182b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032283

Change-Id: I3dfa5acb184a9c8eb15009b8d19c977a2f62cddd
 2022-03-18 21:48:50 +00:00
Pinyao Ting
d08b485739 Merge "Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order." am: 10fc99d0b8 am: b625f5a1d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030444

Change-Id: I12ea26420e292ce069fc1db71be604bbba3bc7de
 2022-03-18 21:41:28 +00:00
Sarah Chin
f3ecc6182b Merge "Update getSubscriptionPlans documentation" 2022-03-18 21:22:49 +00:00
Pinyao Ting
b625f5a1d5 Merge "Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order." am: 10fc99d0b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030444

Change-Id: I21e8592ff96da1c48abce34c0147e13f9b27b49e
 2022-03-18 21:16:07 +00:00
Pinyao Ting
10fc99d0b8 Merge "Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order." 2022-03-18 20:56:36 +00:00
TreeHugger Robot
30410deeaf Merge "SystemUI: res array for statusbar blocked icons" into sc-v2-dev-plus-aosp 2022-03-18 17:31:07 +00:00
Sarah Chin
5fe695fbdd Update getSubscriptionPlans documentation 
getSubscriptionPlans can return null if a plan has not been set for the
given subId yet. Change the annotation from @NonNull -> @Nullable and
update the documentation. SubscriptionManager#getSubscriptionPlans will
return the @NonNull plans instead.

Test: build
Bug: 213896944
Change-Id: I7b232a1a695d1db7cb0d0a177bb1090e9033b805
Merged-In: I7b232a1a695d1db7cb0d0a177bb1090e9033b805
 2022-03-18 09:58:47 -07:00
Raymond Tiong
d44a439edf Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3 am: 2f04f34eb3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024

Change-Id: I442624d1391a7f45d2508145cd9c32c42605f445
 2022-03-18 15:50:23 +00:00
Raymond Tiong
2f04f34eb3 Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024

Change-Id: I3d560d996fba6d50f55959797b20c4a8a0599fb0
 2022-03-18 15:30:54 +00:00
Raymond Tiong
23398e75a3 Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." 2022-03-18 15:13:06 +00:00
Timi Rautamäki
d62853c979 SystemUI: res array for statusbar blocked icons 
Create an array in packages/SystemUI/res/values/config.xml for statusbar
blocked icons to make it easier to overlay wanted options instead of
having to change them in code.

Test: m, verify vibrate-icon is not visible in collapsed statusbar
      on keyguard or launcher.
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com>
Change-Id: I9a04a67a9c0914989d34c8c53ceee97788e7ba6c
Merged-In: I9a04a67a9c0914989d34c8c53ceee97788e7ba6c
 2022-03-18 13:37:21 +00:00
Neil Fuller
0fa758c3b8 Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2 am: 53d21a8591 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083

Change-Id: Ia24fc0a73f74756a8b764961f5ac6023f478f327
 2022-03-18 12:28:29 +00:00
Neil Fuller
53d21a8591 Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083

Change-Id: Ib9ce60d57ccaece7a727e979fe939a80e9880399
 2022-03-18 12:11:47 +00:00
Neil Fuller
72e04a7dc2 Merge "Add the ability to configure NTP port for tests" 2022-03-18 11:48:29 +00:00
Joanne Chung
2081b5d040 Merge changes from topic "presubmit-am-08bbcb587d4e47b6afcc900c23899344" into sc-v2-dev am: 0f608efde9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17184230

Change-Id: I35d157de8376b43f4359cd7243d12973704bf893
 2022-03-18 10:21:11 +00:00
Joanne Chung
221b51260a Merge changes from topic "presubmit-am-08bbcb587d4e47b6afcc900c23899344" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Add HotwordMetricsLogger for statistics logging. 2p: b8c2da2587
  Add HotwordMetricsLogger for statistics logging.
 2022-03-18 10:02:36 +00:00
Joanne Chung
0f608efde9 Merge changes from topic "presubmit-am-08bbcb587d4e47b6afcc900c23899344" into sc-v2-dev 
* changes:
  Add hotword detection metrics.
  Add HotwordMetricsLogger for statistics logging.
 2022-03-18 10:02:36 +00:00
Eric Laurent
0303658e42 [automerger skipped] Merge "audio: SpatializerHelper: fix exceptions when head tracking is not supported" into sc-v2-dev am: 44ac2e0c01 -s ours 
am skip reason: Merged-In I3be6b3f05c9542404379a07f4fc734e45a75152a with SHA-1 511336f1b9 is already in history

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

Change-Id: Ie24215b24e2908e2cd0738ac66b93b849fb33a1a
 2022-03-18 08:31:15 +00:00
Eric Laurent
44ac2e0c01 Merge "audio: SpatializerHelper: fix exceptions when head tracking is not supported" into sc-v2-dev 2022-03-18 08:15:41 +00:00
Eric Laurent
81102a32c1 Merge changes from topic "presubmit-am-1243466f3d904d3d812e413e70d976ef" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] audio: SpatializerHelper: fix exceptions when head tracking is not supported 2p: 511336f1b9
  audio: SpatializerHelper: fix exceptions when head tracking is not supported
 2022-03-18 08:15:41 +00:00
Bill Yi
6a2958fa8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a6149b8b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I979d761de1d9c25edb1305a9b6c064d2c4935538
 2022-03-18 02:37:19 +00:00
Bill Yi
bc4dee4a63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 24cc3cd739 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie32623eee74fa23bd168fc51a5dc8c4a825e5661
 2022-03-18 02:36:53 +00:00
Bill Yi
1d12656b51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 82ec86965b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16a340fda4ebc15d1217ec997cfb2402ca0613a8
 2022-03-18 02:36:22 +00:00
Bill Yi
a0d0343d78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6cd9c53ce0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96438a19a98691bdfa5f49d1d65e13856a48c587
 2022-03-18 02:35:53 +00:00
TreeHugger Robot
649b50ee1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e0edb3136c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I087912801a652cd3eea508c79af9d837ee0b5f11
 2022-03-18 02:35:24 +00:00
TreeHugger Robot
392add2e7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fc14e5fcca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea7c10744fd4b8b1f702a242666818637db2b1e3
 2022-03-18 02:34:11 +00:00
TreeHugger Robot
6d8ed5eaad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 001b23d627 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If50765d650fe6e24ed66212aa34631e751463160
 2022-03-18 02:33:38 +00:00
Bill Yi
6e81a65456 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00b64fd078 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45f89d33aa4bc63eebfaa7029f3494ae65402261
 2022-03-18 02:33:23 +00:00
TreeHugger Robot
ec0e89f721 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b12691005c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I431144a26cffe467672e854c6ba2e262852297a1
 2022-03-18 02:32:05 +00:00
Bill Yi
8c5c492c06 Merge changes from topic "presubmit-am-e165dd214d2e4d94b566a580484fe2b0" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10577e0bce
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:23:19 +00:00
Bill Yi
6a6149b8b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:23:18 +00:00
Bill Yi
24cc3cd739 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:22:56 +00:00
Bill Yi
1a4bf2694f Merge changes from topic "presubmit-am-ff080f640353463bb21c52adece12965" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7976100417
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:22:56 +00:00
Bill Yi
82ec86965b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:22:34 +00:00
Bill Yi
10ccd78113 Merge changes from topic "presubmit-am-b75ac5c75f5842c08ff6a23c2ea06272" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 25428584e9
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:22:34 +00:00
Bill Yi
91e9b32288 Merge changes from topic "presubmit-am-5d3556049687409994874ec08071b5bf" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0ed4025c16
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:17:50 +00:00
Bill Yi
6cd9c53ce0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:17:49 +00:00
TreeHugger Robot
e0edb3136c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:16:52 +00:00
TreeHugger Robot
09c4cacde8 Merge changes from topic "presubmit-am-3c67dfb7daa54b3fa6c841b48ca2ab1a" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d988d842e8
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:16:52 +00:00
TreeHugger Robot
fc14e5fcca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:16:38 +00:00
TreeHugger Robot
2a1f6e2aa2 Merge changes from topic "presubmit-am-b69d09d5878144668fcbe6a339c561a4" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 61213e84fd
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:16:38 +00:00
TreeHugger Robot
001b23d627 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:15:53 +00:00
TreeHugger Robot
29fca3751a Merge changes from topic "presubmit-am-4dd661b2712141e4ad7e71f9634e6b14" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f72bf997b6
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-18 02:15:13 +00:00
TreeHugger Robot
b12691005c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:15:12 +00:00
Sudheer Shanka
afbfc9f7ec Merge "Check if app's ntwk state will be changed before updating procstate." am: 36b9bc8e4b am: a27cba0c10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030427

Change-Id: I007a7c1c16b9fab62d1e24b37fe6dfdd1767d3d7
 2022-03-18 01:48:23 +00:00
Sudheer Shanka
a27cba0c10 Merge "Check if app's ntwk state will be changed before updating procstate." am: 36b9bc8e4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030427

Change-Id: I01f44b56e76b087ed4ce3a5186e20a88b162e952
 2022-03-18 01:20:59 +00:00
Sudheer Shanka
36b9bc8e4b Merge "Check if app's ntwk state will be changed before updating procstate." 2022-03-18 00:55:05 +00:00
Eric Biggers
071a3b1820 Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a am: 6a72370d4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583

Change-Id: I07ed4132c24152febfa4c2ae323594452953f043
 2022-03-17 22:42:57 +00:00
Eric Biggers
6a72370d4b Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583

Change-Id: If0a50e1b1f4727971d8f97dbaba8e456aa3092e2
 2022-03-17 22:19:14 +00:00