Commit Graph

438843 Commits

Author SHA1 Message Date
Bill Yi
959a08ff40 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours am: 4cad3ceff8 -s ours
am: 299fe08e17 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d403d39d416db68e3b555d5db6da115b5e635e9
2019-08-17 10:20:20 -07:00
Bill Yi
45d553be4e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours am: 6f47e12841 -s ours
am: d29f63af44 -s ours
am skip reason: subject contains skip directive

Change-Id: I9bfc4bc4736c9f36f1369144e6f1d2ecdc51520a
2019-08-17 10:16:32 -07:00
Android Build Merger (Role)
299fe08e17 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours am: 4cad3ceff8 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-17 17:07:32 +00:00
Bill Yi
84e035aff3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours
am: 4cad3ceff8 -s ours
am skip reason: subject contains skip directive

Change-Id: I15e21b7a025ea0cd61313e51b6efa7b781ded911
2019-08-17 10:06:30 -07:00
Bill Yi
d29f63af44 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours
am: 6f47e12841 -s ours
am skip reason: subject contains skip directive

Change-Id: I2276d86c6601e418d53e52dced7e7a29a25145e4
2019-08-17 10:06:26 -07:00
Bill Yi
6f47e12841 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 6f1fc7fd3f -s ours
am skip reason: subject contains skip directive

Change-Id: I41e1560312cddc53029f10040e2dd25daf33b975
2019-08-17 09:56:48 -07:00
Bill Yi
4cad3ceff8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 6f1fc7fd3f -s ours
am skip reason: subject contains skip directive

Change-Id: I9ef48ef60149032f1b5fdc65c56ff6f53f1072cd
2019-08-17 09:56:45 -07:00
TreeHugger Robot
6f1fc7fd3f Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-17 16:37:30 +00:00
Wale Ogunwale
33d3fedeab Merge changes from topic "wm-unify"
* changes:
  Renamed some members of AppWindowToken (49/n)
  Removed cancelRecentsAnimationSynchronously() call path (48/n)
  Reset some threads after test finishes.
  Adopt upstream Mockito's solution to mem leak.
  Unify WM test setup for system services (47/n)
2019-08-17 16:26:02 +00:00
Chiachang Wang
df72069202 Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours
am: dcd02d4b32 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 91decc85fc is in history

Change-Id: I89c6875e66f3223a9b86ff0a721694bbaa271937
2019-08-17 07:56:18 -07:00
Chiachang Wang
b9413952a2 [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours
am: ed37e46263 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 91decc85fc is in history

Change-Id: Id9ee99550980efa1f12d44dc7db30a23c7766087
2019-08-17 07:44:03 -07:00
Chiachang Wang
af77e3cee2 [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 -s ours am: 15e3beb0ce -s ours
am: 9e0e6dca6d -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5f8ac27d79 is in history

Change-Id: Ibedf0c2e42da973414f90b1250c2434c377b57e0
2019-08-17 07:37:20 -07:00
Android Build Merger (Role)
dcd02d4b32 Merge "[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5f8ac27d79 is in history" into qt-qpr1-dev-plus-aosp 2019-08-17 14:28:18 +00:00
Chiachang Wang
ed37e46263 [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1
am: c3c41babff -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5f8ac27d79 is in history

Change-Id: If85845ae5b8af10afdb9422d92cdbf599b294d2f
2019-08-17 07:27:18 -07:00
Chiachang Wang
9e0e6dca6d [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 -s ours
am: 15e3beb0ce -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5f8ac27d79 is in history

Change-Id: I029b80d595fa8bbb7e5e672489ec4ad5b3ceb816
2019-08-17 07:26:55 -07:00
Chiachang Wang
15e3beb0ce [automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev
am: 559e7a3de1 -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 5f8ac27d79 is in history

Change-Id: I405bb51787bce13441aa4c3b985ef2b92df18826
2019-08-17 07:17:49 -07:00
Chiachang Wang
c3c41babff Merge "Get resource based on subId for multi-SIM" into qt-r1-dev
am: 559e7a3de1

Change-Id: I0183e42f4b116c6fc44147a9ab6ef7d800bd3687
2019-08-17 07:17:48 -07:00
TreeHugger Robot
559e7a3de1 Merge "Get resource based on subId for multi-SIM" into qt-r1-dev 2019-08-17 13:58:53 +00:00
Wale Ogunwale
83b8a6b866 Renamed some members of AppWindowToken (49/n)
- Renamed fillParent to occludesParent since it indicates the
activity is opaque and fills the entire space of this task.
- Renamed canTurnScreenOn to currentLaunchCanTurnScreenOn since
it only applies to the current launch.
Also, made additional clean-ups relating to the rename.

Bug: 80414790
Test: Existing tests pass
Change-Id: I212fae928d9de87e8324d9702eb96661888f3b46
2019-08-17 13:18:17 +00:00
Wale Ogunwale
a441b924c6 Removed cancelRecentsAnimationSynchronously() call path (48/n)
No longer needed since we are now under a unified lock.

Bug: 80414790
Test: Existing test pass
Change-Id: I5aad974053d85330653b99ebc410f8cbda076348
2019-08-17 13:17:59 +00:00
Garfield Tan
92b9365f9e Reset some threads after test finishes.
Occassionally production code schedule delayed messages to other threads
that hold references to mocks of finished tests. Note we never recreate
a new thread for new tests, or clear messages of these queues, so it's
possible it still uses mocks after they're cleared and cause crashes.

Bug: 122846381
Test: tradefed.sh run commandAndExit WmTests --include-annotation
android.platform.test.annotations.Presubmit --exclude-annotation
androidx.test.filters.FlakyTest
Change-Id: I3ba8f94689ddf633f2d18c74917fa3891c689351
2019-08-17 13:17:30 +00:00
Garfield Tan
e3d37b5056 Adopt upstream Mockito's solution to mem leak.
The upstream solution essentially disallows sharing mock between tests,
so the mock of PowerManagerWrapper is moved to SystemServicesTestRule so
that TestWindowManagerPolicy can use that to create window. It also
makes the life of PowerManagerWrapper mock the same as the
TestWindowManagerPolicy, which is used in both ActivityTestBase and
WindowTestBase but PowerManagerWrapper was only available in
WindowTestBase.

Also, Track mocks created in ActivityStarterTests#testStartActivityPreconditions
and clear them in the middle of execution because the memory usage could be
~0.8G just to run ActivityStarterTests only because of that.

Bug: 123984854
Test: "tradefed.sh run commandAndExit WmTests --include-annotation
android.platform.test.annotations.Presubmit --exclude-annotation
androidx.test.filters.FlakyTest" suffers from a lot fewer OOME.

Change-Id: I274d711fb52084d4c67547374360e373ad1e28d8
2019-08-17 13:17:09 +00:00
Wale Ogunwale
8a1860a9ae Unify WM test setup for system services (47/n)
Needed before we can unify objects in hierarchy.

Bug: 80414790
Bug: 122846381
Test: Existing test pass
Change-Id: Ib3bca1f7ad2b15b5426d198d3c5608e3cba640f7
2019-08-17 13:16:00 +00:00
Bill Yi
dbf0613448 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I94e4a89f9517f1991432295abba850d842d07877
2019-08-16 22:55:20 -07:00
Mehdi Alizadeh
0635808404 Skip using the AppPredictionService if the component is not available am: a1c18a81af
am: f4c7bf02e4

Change-Id: I082e8c3b8aa6d7ef134de4ac54caa54f9b7a832b
2019-08-16 18:59:17 -07:00
Mehdi Alizadeh
f4c7bf02e4 Skip using the AppPredictionService if the component is not available
am: a1c18a81af

Change-Id: I8ca1aaf0b36ee04b7b63a5d04b3fae460e7c554b
2019-08-16 18:50:22 -07:00
Mehdi Alizadeh
a1c18a81af Skip using the AppPredictionService if the component is not available
This CL adds a safeguard in ShareSheet to avoid calls to
AppPredictionService when the service is defined but is not available,
for example in the case of a wrong AiAi apk pushed from GooglePlay.

Bug: 138595943
Test: Manual test by removing the AiAi package from device

Change-Id: I4109c5122faa753d5111ee45698301cb6ccdd7b5
2019-08-16 23:57:46 +00:00
TreeHugger Robot
8db11afbc4 Merge "Add cursor type and hotspot to surface metadata." 2019-08-16 23:08:55 +00:00
Sarah Chin
7ec874dc52 Merge "Changed regex matching for MCC and MNC" 2019-08-16 21:26:15 +00:00
Ryan Mitchell
003d6a2a90 Merge "Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev am: 3186b40edf am: 37e74a8420" into qt-qpr1-dev-plus-aosp
am: 4a2f4bc64c

Change-Id: I85cfe4d016b5df4213dfb034e1da38cbf66077e6
2019-08-16 13:37:06 -07:00
Ryan Mitchell
4a23ff3038 Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev am: 3186b40edf am: 70d103e827
am: e0c15a0340

Change-Id: I494e37744bcd029e1445b52f0987c20d8958bcd4
2019-08-16 13:32:58 -07:00
Kevin Chyn
04dcb5896a Merge changes from topic "biometric-tests"
* changes:
  4/n: Make BiometricDialogView testable
  3/n: Move task stack listener to SystemUI
  2/n: Update BiometricService with cleaner lifecycle
  1/n: Update BiometricDialog (SystemUI side) with cleaner lifecycle
2019-08-16 20:28:23 +00:00
Android Build Merger (Role)
4a2f4bc64c Merge "Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev am: 3186b40edf am: 37e74a8420" into qt-qpr1-dev-plus-aosp 2019-08-16 20:22:51 +00:00
Ryan Mitchell
86f945cdf6 Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev am: 3186b40edf
am: 37e74a8420

Change-Id: Iddfa662ddb58f22e9a98e327cd214593c8a7859a
2019-08-16 13:22:09 -07:00
Ryan Mitchell
e0c15a0340 Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev am: 3186b40edf
am: 70d103e827

Change-Id: I2fc13e4db5cece515844f1bce04b232724520ff1
2019-08-16 13:21:26 -07:00
Ryan Mitchell
70d103e827 Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev
am: 3186b40edf

Change-Id: Ie65ae898bb6c4f7bbf909a59be84038b4cdd3367
2019-08-16 13:11:40 -07:00
Ryan Mitchell
37e74a8420 Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev
am: 3186b40edf

Change-Id: I0374997faf945a2cd60179cf1c35a7fbcd255285
2019-08-16 13:11:37 -07:00
TreeHugger Robot
3186b40edf Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev 2019-08-16 19:43:52 +00:00
TreeHugger Robot
336f7c755d Merge "Remove the test of two fixed value static final arrays at boot." 2019-08-16 17:41:08 +00:00
TreeHugger Robot
66aa3ad048 Merge "Merge Trampoline and BMS" 2019-08-16 17:12:54 +00:00
David Su
cc540adc9d Merge "Removed WifiController deferred enable configurations" 2019-08-16 17:01:36 +00:00
TreeHugger Robot
8038ac7d57 Merge "Move processing off of HIDL Binder" 2019-08-16 16:47:52 +00:00
TreeHugger Robot
3628bb3a64 Merge "Cover framework code in hiddenapi-mappings." 2019-08-16 16:23:26 +00:00
Al Sutton
3ca5ce7499 Remove the test of two fixed value static final arrays at boot.
We're currently comparing two fixed sets of values on every device
on every boot. I've moved this check to a test so we can validate
the values in the arrays once and then ship compliant code.

Bug: 139373401
Test: atest SettingsProviderTests
Change-Id: I7889118ef08da89d17e605458fe4bde881873a18
2019-08-16 14:45:19 +00:00
Bernardo Rufino
15bf74cf26 Merge Trampoline and BMS
Perform the merge by:
1. Moving lifecycle inside Trampoline without IDE support
(since we'll rename Trampoline in this CL as well, making the published binder
the same).
2. Move constants to Trampoline without IDE support as well (again, we'll
rename Trampoline).
3. Change the last usages of BMS constructor to use
Trampoline's. Now BMS is effectively empty.
4. Delete BMS.
5. Rename Trampoline to BMS with IDE support (renaming related classes
and variables that the IDE could find).
6. \o/

Split CL into Path Sets to ease review:
Base > PS2: Steps 1..4 (+121 -333)
PS2 > PS4: Step 5 (+214 -204)

Test: m -j
Test: adb shell dumpsys backup
Test: atest BackupManagerServiceTest BackupManagerServiceRoboTest
Bug: 135661048
Change-Id: Ia6cd340d3c5fcdb9c8f409035d032efeb090cd20
2019-08-16 14:54:18 +01:00
Tomasz Wasilczyk
f168a291de Move processing off of HIDL Binder
Bug: 138412770
Test: atest StartProgramListUpdatesFanoutTest
Change-Id: I51a89c5792a1938cfd6720a10b6830b8cf62b9cd
2019-08-16 06:52:51 -07:00
Artur Satayev
3cc3fa4151 Cover framework code in hiddenapi-mappings.
It was missing most of the source code outside of core/...

Test: m, m hiddenapi-mappings
Change-Id: I9559346d306499c2f9659b73a68962d640fe644d
2019-08-16 14:41:25 +01:00
Bernardo Rufino
90ad227c3e Merge changes I7758e006,I49bb2315
* changes:
  Move getServiceForUserIfCallerHasPermission() to Trampoline
  Move dump() to Trampoline
2019-08-16 11:56:53 +00:00
vichang
433bd93946 Merge "API updated for ICU4J 64.2" am: 4c322503bb am: 5cff30ded7 am: fbc11d88e1 am: 6b3ae3de80
am: 132d20c3f3

Change-Id: I9caaa083c363cabe8d942c3e71d82c8d96d98bad
2019-08-16 04:49:07 -07:00
vichang
132d20c3f3 Merge "API updated for ICU4J 64.2" am: 4c322503bb am: 5cff30ded7 am: fbc11d88e1
am: 6b3ae3de80

Change-Id: If94ae513b5105d8e72b6f27cf8cebbbd06da9e3d
2019-08-16 04:39:32 -07:00