393832 Commits

Author SHA1 Message Date
Nicholas Sauer
c1e8c3ca11 Fix SettingsProviderTest.
bug: 119814205
Test: atest -s emulator-5554 frameworks/base/packages/SettingsProvider/test
Change-Id: Ifa57074f492e81897866ddfb4a4bf86d44b2ad74
2018-11-20 08:49:08 -08:00
David Brazdil
cb7fa2f389 Check in P dark greylist
Test: m appcompat
Change-Id: If4d7377631c1e8c1194a7bd70814b663d9af17fb
2018-11-20 16:36:21 +00:00
Aaron Heuckroth
96cd93f55e Remove setAsMainLooper from several flaky tests.
Test: Automated tests should pass, ideally with fewer flakes!
Change-Id: I6459b1bd1c46b3589703e55504a96c76a8447204
2018-11-20 11:17:30 -05:00
Riddle Hsu
32a87b8c43 Fix unable to resume activity with dismiss-keyguard flag
When the activity with dismiss-keyguard is becoming top because
the other top non-show-when-lock activities are gone, the occluded
state may not been updated that causes activity state stays at
stopped and visible.

Bug: 117859366
Test: atest CtsActivityManagerDeviceTestCases:KeyguardTests# \
            testResumeDismissKeyguardActivityFromBackground

Change-Id: I1dc975a3a45094b163043f0592f422142fb4fc43
2018-11-21 00:08:19 +08:00
Vishnu Nair
4a17e47530 WM: Guard against released surfaces in forced rotator
Fixes: 119470176
Test: Rotate phone with cutout enabled, verify cutout overlay is still properly synchornized and SystemUI does not crash.
(cherry picked from commit dcb24ca47138219f41b730af8cdcd2db8f553562)

Merged-In: Ibce67ccede8f114b82779a74853e43b3abe44c55
Change-Id: Ibce67ccede8f114b82779a74853e43b3abe44c55
2018-11-20 16:08:06 +00:00
Nick Chalko
490db5dda0 Merge "Use extcon to listen for hdmi state changes" 2018-11-20 16:01:13 +00:00
Beverly
e98937afe3 Override equals in Person object
Test: atest NotificationDataTest
Change-Id: I8423a40c6f0ccf6d9cd0c3141487b84679d966ff
Fixes: 119029933
2018-11-20 11:01:00 -05:00
TreeHugger Robot
68060c6924 Merge "Remove dependency on TreeMap from getSortedInputMethodAndSubtypeList()" 2018-11-20 15:42:28 +00:00
Hai Zhang
7e3fb2a4ce Merge "Add MANAGE_ROLE_HOLDERS permission to shell." am: a2ccaf6e68 am: 5837aa482b
am: 816e35e405

Change-Id: I93034c3105c9f3857be8309a905e432a3c9b2005
2018-11-20 07:40:36 -08:00
TreeHugger Robot
b96896d614 Merge "Switch to mockito-extended" 2018-11-20 15:27:59 +00:00
TreeHugger Robot
d26b8bc796 Merge "resolve merge conflicts of 183271d1d240fb2a92628e00b132b4490461f59f to master" 2018-11-20 15:23:40 +00:00
Beverly
4f7b53dee7 Use isGroupBlocked to check for blocked notifGroup
Avoids null pointer exception

Test: atest PreferencesHelperTest
Change-Id: Ic94b6f1f8768d4cb4afcdef8ec03165e6523188e
Fixes: 119798101
2018-11-20 09:58:06 -05:00
Nick Chalko
cc863e433b Use extcon to listen for hdmi state changes
Test: flash; watch "adb shell dumpsys activity broadcasts | grep  HDMI"
Bug: 116011465
Change-Id: Iba8d71450476a0729a19aec4261cfc6ff6c75e05
2018-11-20 06:51:02 -08:00
TreeHugger Robot
43fae0a000 Merge "Do not use both "virtual" and "override"." 2018-11-20 14:43:14 +00:00
Louis Chang
a358d7611c Set minimum scaled width/height to 1
Applications could be launched on a secondary display that
has lower density than default display. While some applications
may use 1x1 image resource as activity background, the scaled
width/height would be 0 if down scaling the 1x1 image with
scale ratio that is less than 1/2.

Making sure the scaled width/height won’t less than 1 to
prevent application crashed.

Bug: 117749148
Test: Launch app on secondary display

Change-Id: I73567dd237736466d0bc423485359d50073d86c1
2018-11-20 22:38:08 +08:00
yuanjiahsu
b39b469b12 resolve merge conflicts of 183271d1d240fb2a92628e00b132b4490461f59f to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I219a85189fb4207a0605ca541f8ecc29f5ee6808
2018-11-20 20:55:49 +08:00
TreeHugger Robot
1a1f9ae607 Merge "Ports encryption/storage from gmscore to AOSP." 2018-11-20 12:48:27 +00:00
Mihai Popa
a5c84f2980 Merge "[Magnifier-57] Add API to set overlay" 2018-11-20 11:14:28 +00:00
Neil Fuller
6caa954ead API for retrieving time zone IDs by country
New method has been requested by Setup Wizard.

Test: CTS: run cts-dev -m CtsUtilTestCases -t android.util.cts.TimeUtilsTest
Bug: 116544863
Merged-In: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
Change-Id: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
(cherry picked from commit f9bb2d8f020c2c7815359cae8dc8255fd8e9d1de)
2018-11-20 10:59:18 +00:00
Misha Wagner
bcec7d0f9f Merge "Change all uses of uint to int in CpuTimePerThreadFreq" 2018-11-20 10:07:24 +00:00
markchien
b6eb2c218b Add Entitlement Manger to encapsulate provisioning mechanics
Test: - build, flash, booted
      - runtest frameworks-net

bug: 111490073

Change-Id: I4f67f8679ab91b5c463fc349f5f21aee08bd943e
2018-11-20 17:51:52 +08:00
Jeff Chang
de3bad4b48 Merge "Enable the AM shell command to support the secondary display" 2018-11-20 09:46:16 +00:00
Bram Bonné
70bb9a6462 Ports encryption/storage from gmscore to AOSP.
A few additional changes (apart from style and usual dependencies) were needed:
- BackupEncryptionDbHelper now extends SQLiteOpenHelper directly,
implementing relevant methods.
- Dependencies on Guava are replaced by their Java equivalents.

Bug: 111386661
Test: atest RunFrameworksServicesRoboTests
Change-Id: I4566980fc81d6cff5e7012184502e028980512ae
2018-11-20 09:38:11 +00:00
Neil Fuller
9347978d5f Merge "API for retrieving time zone IDs by country" 2018-11-20 09:33:24 +00:00
TreeHugger Robot
2f5d4be26b Merge "deprecate ALL_CONDITION_CHANGE in gauge" 2018-11-20 09:16:56 +00:00
Hai Zhang
816e35e405 Merge "Add MANAGE_ROLE_HOLDERS permission to shell." am: a2ccaf6e68
am: 5837aa482b

Change-Id: I4ddb49575f423237be4f354bbf37c5bce56fa958
2018-11-20 00:09:55 -08:00
Hai Zhang
5837aa482b Merge "Add MANAGE_ROLE_HOLDERS permission to shell."
am: a2ccaf6e68

Change-Id: I438f8c30100d084582df74d104ec3f4063caba86
2018-11-19 23:59:16 -08:00
Dan Willemsen
c15cf1d02e Convert bootanimation to Android.bp
See build/soong/README.md for more information.

Test: cd frameworks/base/cmds/bootanimation; mma
Change-Id: I7e023ffc42f61ce9a215a958fbbd158a6a8352d7
Merged-In: I7e023ffc42f61ce9a215a958fbbd158a6a8352d7
(cherry picked from commit efc3e37c9b2dc1599cf75b49514665049951d7de)
2018-11-19 23:45:08 -08:00
Treehugger Robot
a2ccaf6e68 Merge "Add MANAGE_ROLE_HOLDERS permission to shell." 2018-11-20 07:44:22 +00:00
Dan Willemsen
efc3e37c9b Convert bootanimation to Android.bp
See build/soong/README.md for more information.

Test: cd frameworks/base/cmds/bootanimation; mma
Change-Id: I7e023ffc42f61ce9a215a958fbbd158a6a8352d7
2018-11-19 23:39:47 -08:00
TreeHugger Robot
5e2f5f27ff Merge "Clarify how IME ID is treated in ImeSubtypeListItem#compareTo()" 2018-11-20 07:26:03 +00:00
Yuanjia Hsu
183271d1d2 Merge "Modify feature flag of Personal Safety" am: b4a197ca39
am: 4f4e52c1b9

Change-Id: Iebde195a7f6fd86cae357169fae76368df9727b4
2018-11-19 23:12:33 -08:00
Yuanjia Hsu
4f4e52c1b9 Merge "Modify feature flag of Personal Safety"
am: b4a197ca39

Change-Id: Id3446d38901e90106aa7d869f2964fc9e82d725a
2018-11-19 23:04:09 -08:00
TreeHugger Robot
6dc4e652a7 Merge "Pre-grant permissions split from install permissions" 2018-11-20 06:50:17 +00:00
Yuanjia Hsu
b4a197ca39 Merge "Modify feature flag of Personal Safety" 2018-11-20 06:39:55 +00:00
TreeHugger Robot
d76793e26a Merge "Return ProcessRecord toString() for WindowProcessController" 2018-11-20 06:01:45 +00:00
Yohei Yukawa
fbc5547e5f Remove dependency on TreeMap from getSortedInputMethodAndSubtypeList()
InputMethodAndSubtypeList#getSortedInputMethodAndSubtypeList()
currently sorts ImeSubtypeListItem as follows:

 1. Create a sorted list of IMEs by TreeMap with the sorting key
      imi.loadLabel(mPm) + "/" + imi.getId()
 2. Generate list of ImeSubtypeListItem objects.
 3. Do stable sort ImeSubtypeListItem lists with the following order
      mImeName
      mIsSystemLocale
      mIsSystemLanguage
      mSubtypeName
 4. Return the sorted ImeSubtypeListItem list.

Since in the step 2 everything is done sequentially and the result for
each IME will not be affected by other IMEs, we can in theory unify
the step 1 into the step 3 so that we can perform sorting only once.

In order to avoid unnecessary behavior change in this CL, with this CL
the step 1 will be removed and the sorting order in the step 3 will be
updated as follows:
      mImeName
      mIsSystemLocale
      mIsSystemLanguage
      mSubtypeName
      mImi.getId()

This should be sufficient to preserve the current behavior because:
  a) if two ImeSubtypeListItem items were not classified as the same
     in the step 3, the step 1 basically did not matter and,
  b) if two ImeSubtypeListItem items were classified as the same in
     the step 3, those two items would have preserved the sort order
     in the step 1.  Here mImeName == imi.loadLabel(mPm) so if this
     is the case only mImi.getId() matters in this scenario.

Therefore this CL should not have any user-visible behavior change.

Fix: 64612471
Test: atest InputMethodSubtypeSwitchingControllerTest
Change-Id: I4204275f1fc2040d98b9c55a38ab8b8d50e65126
2018-11-19 21:54:10 -08:00
Insun Kang
90ed8e65b0 Merge "Add a filegroup rule for building media1.0 mainline module" 2018-11-20 05:54:04 +00:00
Yohei Yukawa
7e06f2beca Clarify how IME ID is treated in ImeSubtypeListItem#compareTo()
This is a preparation to remove dependency on TreeMap from
InputMethodAndSubtypeList#getSortedInputMethodAndSubtypeList().

This CL itself must not have any behavior change.

Bug: 64612471
Test: atest InputMethodSubtypeSwitchingControllerTest
Change-Id: I5684bbbb3b223c4e6cc7892b2620fb91356b7037
2018-11-19 21:53:04 -08:00
Tadashi G. Takaoka
a7a66956cb Switch to mockito-extended
Bug: 113806960
Test: Pass all presubmit tests in WmTests.
  $ tradefed.sh run commandAndExit WmTests \
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest
Change-Id: Ie71e0f3d1abb221abf0343606e3d26254e7f9ac8
2018-11-20 05:51:38 +00:00
Zimuzo
c1537dc765 Pre-grant permissions split from install permissions
When runtime permissions are split, by default, they inherit the grant states from their source permissions.
We now support the same inheritance for install time permission splits.
This supports activity recognition permission that is being split from install time in gmscore to runtime in the platform.

Bug: 111411340
Test: App requesting old install activity recognition is granted new runtime permission on install
Change-Id: I2a77e27f7d821d1b15ba8f0310735b51d6e80323
2018-11-20 05:00:24 +00:00
Zimuzo Ezeozue
621a683ea7 Merge "Add privileged API to control keyguard secure notifications" 2018-11-20 04:50:52 +00:00
Hung-ying Tyan
69ae5f7daf [automerger skipped] Merge "Allow all system configs in /product" am: eca4c3a0d6 am: 0601a2a886
am: c3f416b6cd  -s ours

Change-Id: Id3176b10f1c93a4d463822c961fb0d1ecab8533c
2018-11-19 20:19:58 -08:00
Hung-ying Tyan
c3f416b6cd Merge "Allow all system configs in /product" am: eca4c3a0d6
am: 0601a2a886

Change-Id: I4822a4cfddc768fd210f0fe74cf2345f88b0a1b7
2018-11-19 20:09:55 -08:00
Hung-ying Tyan
0601a2a886 Merge "Allow all system configs in /product"
am: eca4c3a0d6

Change-Id: I417fcac7ba8fd76a244f274144d5713dfa01329c
2018-11-19 19:57:34 -08:00
Treehugger Robot
eca4c3a0d6 Merge "Allow all system configs in /product" 2018-11-20 03:45:37 +00:00
TreeHugger Robot
1cdd029e97 Merge "Clear last focus of previous display when reparenting" 2018-11-20 03:29:08 +00:00
Tony Zhu
705a4390ec Merge "[API Review]Clarify method that obtain a component name" am: c128fa0f93 am: 7655d9dd0f
am: ed8581bf13

Change-Id: I8c3007d800d80cc3bcdf83619c769801255ba54d
2018-11-19 19:06:28 -08:00
Tony Zhu
ed8581bf13 Merge "[API Review]Clarify method that obtain a component name" am: c128fa0f93
am: 7655d9dd0f

Change-Id: Ib8b3215dfeddcf7ff2891f04ebf6bbbc27d8fc10
2018-11-19 18:57:35 -08:00
Wale Ogunwale
827a7fcaee Merge "Revert "Added mockito-extended support to WmTests."" 2018-11-20 02:55:51 +00:00