Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
markchien
197eefae73 [automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 4b198cb8c3 am: f7d9dd76ab -s ours am: e37ca4b0bc -s ours 
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 b1cb53b481 is in history

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

Change-Id: Id123e9df66ca3a13dd39ff8b5c39bb2560e23863
 2020-06-20 04:39:03 +00:00
Automerger Merge Worker
3bedc12cae Merge "Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef am: 66d53819d0" into rvc-d1-dev-plus-aosp 2020-06-20 04:38:39 +00:00
Amith Yamasani
45fe45b19f Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef am: 66d53819d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: I9f21f72a0281c0aae4c5b201c240382f36b2b2df
 2020-06-20 04:38:31 +00:00
Amith Yamasani
1a8c5848a4 Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef am: b259f054d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: I64b6c752c6ecf0cc1c71ec10e75ee5304e938471
 2020-06-20 04:38:27 +00:00
Amith Yamasani
5a3620c470 Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef am: 66d53819d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: I77391e38617e92fbb2b0a551c565bd738bbc072d
 2020-06-20 04:38:19 +00:00
Suprabh Shukla
8ec9561614 RESTRICT AUTOMERGE Logging for alarms when they hit the limit 
Temporarily writing a wtf log when the limit is reached by the system,
because we lose all the alarm manager state after the crash.

Test: adb logcat -s AlarmManager

Bug: 157782538
Change-Id: I008ea8a75503ece620af344a085875f13532d962
 2020-06-19 21:35:43 -07:00
Mark Chien
798f6db98c [automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours 
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 0ed433e4cd is in history

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

Change-Id: Ie251a5e4cbfc78f8b26ae32a12679dd08bd348d9
 2020-06-20 04:32:35 +00:00
markchien
e37ca4b0bc [automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 4b198cb8c3 am: f7d9dd76ab -s ours 
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 b1cb53b481 is in history

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

Change-Id: I259c3a257511436baac8894c7677dbd3090941ab
 2020-06-20 04:32:18 +00:00
Amith Yamasani
b259f054d0 Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: Ic472ee8ed96f9e66771d4448cb4f9f2022ebb572
 2020-06-20 04:26:46 +00:00
Amith Yamasani
66d53819d0 Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev am: df604649ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871514

Change-Id: Id354bcefd8414ede5e550b7d7baafd5781dc1029
 2020-06-20 04:26:29 +00:00
Mark Chien
932375528d Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345357

Change-Id: Ib1eaa2f9bd1c32014cd13680dbec9974dfa0130d
 2020-06-20 04:17:01 +00:00
markchien
f7d9dd76ab Pass entitlement configuration to Settings for entitlement check am: 4b198cb8c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1253710

Change-Id: I6a87f11471ada84a81b643ba3626e3619b31b1dd
 2020-06-20 04:16:58 +00:00
Amith Yamasani
df604649ef Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev 2020-06-20 04:12:16 +00:00
Mark Chien
788abd7c99 Merge changes from topics "pass-res", "remove-isProvisioningNeeded" 
* changes:
  Protect invalid entitlement app configuration
  Pass entitlement configuration to Settings for entitlement check
 2020-06-20 04:02:15 +00:00
Taran Singh
4291410118 Animate IME with zero insets 
When IME has zero insets, it doesn't map to any side and doesn't have
can't be animated.
IME can have zero insets in following cases:
1. Floating IME
2. Fullscreen IME (in landscape)
3. IME doesn't overlap with IME target window.

In order to animate a type, it must have insets. We can animate IME
from negative insets to zero and vice-versa. This makes zero insets IME a
special case of ISIDE_BOTTOM.
Deprecate SIDE_FLOATING because it shouldn't logically map to a side.

Fix: 153909316
Test: atest WindowInsetsAnimationImeTests#testZeroInsetsImeAnimates
Change-Id: I6d1d3430888db4632cb2f93e9042f692b35ebaeb
 2020-06-20 03:51:00 +00:00
Automerger Merge Worker
674d508f74 Merge "Merge "Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 617cda87a3" into rvc-d1-dev-plus-aosp am: ac63060451" into rvc-qpr-dev-plus-aosp 2020-06-20 03:22:47 +00:00
Automerger Merge Worker
434f776832 Merge "Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 617cda87a3" into rvc-d1-dev-plus-aosp am: ac63060451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: I3af21597d8684137e363c129a7f50df0ac2c1b92
 2020-06-20 03:22:34 +00:00
TreeHugger Robot
ea5ad00ff0 Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 8f543e097a am: 872bcfaabd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: Ib4d033f552888c02786c267187df95db463434cd
 2020-06-20 03:22:31 +00:00
TreeHugger Robot
e2c8f75072 Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 8f543e097a am: 2fb54c5732 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: I35bae029f38f01762eb159e669cd61cfc62bf40d
 2020-06-20 03:22:10 +00:00
Automerger Merge Worker
ac63060451 Merge "Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 617cda87a3" into rvc-d1-dev-plus-aosp 2020-06-20 03:10:45 +00:00
TreeHugger Robot
872bcfaabd Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 8f543e097a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: Ie5a5be8f7508cba0add7c41f6a45311e697dccf0
 2020-06-20 03:10:44 +00:00
TreeHugger Robot
972659cda5 Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 617cda87a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: I315f21cf2806e50844343f71325e1a8a5deba0f5
 2020-06-20 03:10:41 +00:00
TreeHugger Robot
2fb54c5732 Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 am: 8f543e097a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: I58175acbc44e443ed6504643718e3f0f692c9760
 2020-06-20 03:10:23 +00:00
TreeHugger Robot
8f543e097a Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: I39c14b59cac6f8dd3dcdd5d5dffd133ef5a0b16e
 2020-06-20 02:57:51 +00:00
TreeHugger Robot
617cda87a3 Merge "Let biometric prompt button text wrap to new line" into rvc-dev am: 3987866cd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936774

Change-Id: Id9439176523c817e8203683d00f959b72d044c83
 2020-06-20 02:57:45 +00:00
TreeHugger Robot
3987866cd7 Merge "Let biometric prompt button text wrap to new line" into rvc-dev 2020-06-20 02:45:17 +00:00
Frank Li
623a902fee [automerger skipped] Merge "Adding Network Tethering Metrics/atoms in the statsd" am: 280471d6d1 am: 2575b7aa1d -s ours am: a806e9536a -s ours am: 3d27e629d5 -s ours 
am skip reason: Change-Id Ia0dc1dd45e006348c3856b483972a4ccd6048d05 with SHA-1 8abf3a7c23 is in history

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

Change-Id: Iebaaecb13f92e10af67e7271d31f1c8be9f7ac73
 2020-06-20 02:36:07 +00:00
Frank Li
3d27e629d5 [automerger skipped] Merge "Adding Network Tethering Metrics/atoms in the statsd" am: 280471d6d1 am: 2575b7aa1d -s ours am: a806e9536a -s ours 
am skip reason: Change-Id Ia0dc1dd45e006348c3856b483972a4ccd6048d05 with SHA-1 8abf3a7c23 is in history

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

Change-Id: I4325b02e6bec236d1214736e2bd92b976443c616
 2020-06-20 02:35:48 +00:00
Ramy Medhat
b4b6d97d3a Merge "Enable metalava sandbox in StubLibraries.bp and ApiDocs.bp." am: fbb36c8bd8 am: a15550216a am: cc8fce1964 am: df910db889 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1335073

Change-Id: I41739bb1b105c2099b4ba6c04968813407d22243
 2020-06-20 02:35:47 +00:00
Frank Li
a806e9536a [automerger skipped] Merge "Adding Network Tethering Metrics/atoms in the statsd" am: 280471d6d1 am: 2575b7aa1d -s ours 
am skip reason: Change-Id Ia0dc1dd45e006348c3856b483972a4ccd6048d05 with SHA-1 8abf3a7c23 is in history

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

Change-Id: I02864f0c9510910495d9eb3ba71774aa09de23a3
 2020-06-20 02:21:02 +00:00
markchien
b39a7b35cb Protect invalid entitlement app configuration 
There is a protection in Settings that Settings would gray out if
tethering requires entitlement check but the entitlement app is
invalid. Tethering resource is moved from framework to tethering
module, so Settings can not fetch entitlement app name anymore.

In this change, tethering module would check whether entitltement app
package name is exsited if entitlement check is needed. Tethering would
be not supported (Settings tethering option would be hidded) if
entitlement app is not installed.

After moving the protection into tethering module,
TetherUtil#isProvisioningNeeded is no longer needed. Because The
only use case is Settings wants to gray out tethering setting
when entitltement check is needed but entitlement app is invalid.

Bug: 146918263
Test: atest TetheringCoverageTests
Change-Id: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
Merged-In: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
 2020-06-20 10:19:25 +08:00
markchien
4b198cb8c3 Pass entitlement configuration to Settings for entitlement check 
Tethering resource configuration is move from framwork to tethering
module. Since tethering resource would not be accessible from outside
of tethering module, EntitlementManager would tell Settings the
entitlement configuration via intent extra when run entitlement check.

Bug: 146918263
Test: atest TetheringTests
Change-Id: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
Merged-In: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
 2020-06-20 10:19:21 +08:00
Ramy Medhat
df910db889 Merge "Enable metalava sandbox in StubLibraries.bp and ApiDocs.bp." am: fbb36c8bd8 am: a15550216a am: cc8fce1964 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1335073

Change-Id: I9890e5e1821ab7af6b1e448bdc11f36a58f9d707
 2020-06-20 02:14:06 +00:00
Frank Li
2575b7aa1d Merge "Adding Network Tethering Metrics/atoms in the statsd" am: 280471d6d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1295362

Change-Id: I0739b747b4227d50321674e8ad4fbaf73706a528
 2020-06-20 02:08:40 +00:00
Ramy Medhat
cc8fce1964 Merge "Enable metalava sandbox in StubLibraries.bp and ApiDocs.bp." am: fbb36c8bd8 am: a15550216a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1335073

Change-Id: Id4896589995ff827f6c5cc10058f340a01b642d2
 2020-06-20 01:58:49 +00:00
Andy Hung
c1bd8cbfd3 AudioTrack: Update javadoc 
Remove todo, audio TV metadata still pending final update for rvc-tv-dev.

AudioDeviceInfo.getEncapsulationModes suppresses return of
AudioTrack.ENCAPSULATION_MODE_NONE.

Test: make docs and check
Bug: 147778408
Change-Id: Ia7da6c3805e42f7a6b9a3b18d44f4c4ef92171a4
 2020-06-19 18:57:14 -07:00
Frank Li
280471d6d1 Merge "Adding Network Tethering Metrics/atoms in the statsd" 2020-06-20 01:52:12 +00:00
Treehugger Robot
947d773e70 Merge "Move car companion device support app perms to framework" am: 52a31dd406 am: 90633bd6d4 am: 0b572759c2 am: 6da7e9c7f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340119

Change-Id: Ib2a7f25af45e09ed5bdf63747e59009da83d8539
 2020-06-20 01:51:12 +00:00
Ramy Medhat
a15550216a Merge "Enable metalava sandbox in StubLibraries.bp and ApiDocs.bp." am: fbb36c8bd8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1335073

Change-Id: I72fe23844e9d634cd92ca47d5ce5330ca4d0ecaf
 2020-06-20 01:45:57 +00:00
Treehugger Robot
6da7e9c7f8 Merge "Move car companion device support app perms to framework" am: 52a31dd406 am: 90633bd6d4 am: 0b572759c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340119

Change-Id: Ie1d42076584b10ee14833a8adbb45883b248c785
 2020-06-20 01:40:26 +00:00
Ramy Medhat
fbb36c8bd8 Merge "Enable metalava sandbox in StubLibraries.bp and ApiDocs.bp." 2020-06-20 01:33:24 +00:00
Treehugger Robot
0b572759c2 Merge "Move car companion device support app perms to framework" am: 52a31dd406 am: 90633bd6d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340119

Change-Id: Ia59aa127b1e7071ddaf5fe0b94d0767cea720494
 2020-06-20 01:23:26 +00:00
Automerger Merge Worker
cc7c86300e Merge "Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: fddc33a377 am: 66b09a3bf9" into rvc-qpr-dev-plus-aosp 2020-06-20 01:18:26 +00:00
Wonsik Kim
6ab039941d Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: 3c31448da7 am: 4466db4de8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I8229cde71d65f86606d8f883c060f261281dd21d
 2020-06-20 01:18:19 +00:00
Wonsik Kim
2aef7ce2a6 Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: fddc33a377 am: 66b09a3bf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I0419451097e00e7810f929cdd5924bae370fc3bf
 2020-06-20 01:18:19 +00:00
Wonsik Kim
710d84d751 Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: fddc33a377 am: 9d030d5a3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I5b588fe507564e79bbbd1ca178df57a37ebd1c1a
 2020-06-20 01:17:59 +00:00
Treehugger Robot
90633bd6d4 Merge "Move car companion device support app perms to framework" am: 52a31dd406 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340119

Change-Id: I764cf448be1e3e6628741502e206ddcbcff0d9c5
 2020-06-20 01:07:43 +00:00
Curtis Belmonte
7100caa75e Let biometric prompt button text wrap to new line 
Fixes an issue where the buttons on the biometric prompt would fail to
wrap to a second line in order to accommodate long label text. This
caused the buttons to be truncated in some languages (e.g. Russian).

Test: On a Pixel 4 XL:
1. Ensure a lock pattern is set and Face Unlock is enabled
2. Set the system language to Russian (Russia)
3. Open wifi settings and select a saved network
4. Tap on the "Share" button for this network
5. Wait for Face Unlock to time out for the prompt
6. Rotate the device between portrait and landscape

Fixes: 158240727
Change-Id: I51da6b124ffcd867322ee699e3908847e1df7ecd
 2020-06-19 18:02:30 -07:00
Wonsik Kim
66b09a3bf9 Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: fddc33a377 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: I654fc16f23957f0c23585dceb15d9ee470ddb765
 2020-06-20 01:01:29 +00:00
Wonsik Kim
4466db4de8 Merge "media: fix race condition on async release" into rvc-dev am: 7e1b558949 am: 3c31448da7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11927284

Change-Id: Ic2a16f31b2d5e42f684eb177040eefdaccab9601
 2020-06-20 01:01:21 +00:00