309511 Commits

Author SHA1 Message Date
TreeHugger Robot
5048c1cbb1 Merge "Fill-provider can control the negative button label and listener" 2017-03-03 04:45:38 +00:00
TreeHugger Robot
5a66e72a95 Merge "Allow auto-fill services to disable themselves" 2017-03-03 04:45:38 +00:00
Hyundo Moon
0e6215391d Modify JavaDoc of MediaBrowserService.getBrowserRootHints
The method MediaBrowserService.getBrowserRootHints can be called
inside of onSearch(), but the JavaDoc does not mention it.
This CL adds this information in the JavaDoc.

Test: Called getBrowserRootHints inside of onSearch method.
Change-Id: If82a371c8d06aab396e29141827c8991cff2cd3e
2017-03-03 13:24:53 +09:00
Calin Juravle
aba6330a67 Merge changes from topic 'secondary-dex1' am: d56d98b860 am: e6f3ed6aef
am: 969327b823  -s ours

Change-Id: I03c3f76927e4d9e46d512fe9074cacb10d743167
2017-03-03 04:10:02 +00:00
Svetoslav Ganov
986a04f2c9 Merge "Add a missing write lock to settings state." 2017-03-03 04:08:20 +00:00
Calin Juravle
969327b823 Merge changes from topic 'secondary-dex1' am: d56d98b860
am: e6f3ed6aef

Change-Id: Ia637e1c6caccf33137cde413779911dab5677147
2017-03-03 03:56:13 +00:00
Elliott Hughes
160d6ee170 Merge "Remove the name length limit for system properties." am: c657b769ab am: 6f00e6e977
am: b088dd5d15  -s ours

Change-Id: I4c40815a0bbb4bf216fb9ac98c9c37853a74c5a0
2017-03-03 03:52:37 +00:00
Calin Juravle
e6f3ed6aef Merge changes from topic 'secondary-dex1'
am: d56d98b860

Change-Id: Ia9c1329584597a6f30aeaa2bd8e8c979705d8eea
2017-03-03 03:51:04 +00:00
Calin Juravle
7d768a66ee Merge changes from topic 'secondary-dex' am: 9e88c53337 am: a400ccdaa0
am: aa95700b54

Change-Id: I79aa3a24a3982ca60bb1b51323e0b9f6736a7119
2017-03-03 03:45:39 +00:00
Calin Juravle
29db348333 Save package dex usage info after secondary dex reconciliation am: 61fd6eab46 am: ade90057c6
am: efb30d85a5  -s ours

Change-Id: Iff414ec5fcaa700a84c92067425e3717bfddc7b6
2017-03-03 03:44:41 +00:00
Calin Juravle
a6a0b9f89b Compile secondary dex files during background dexopt job am: 574994afde am: 112a61bf32
am: 36bc489096  -s ours

Change-Id: I5b884dd7119d79489c303c3e5c6c1b1871a212b2
2017-03-03 03:43:42 +00:00
Calin Juravle
421ee4856a Add a shell command to force the background dexopt job am: f7edab63d9 am: 90ac28d618
am: 6f80bb4166  -s ours

Change-Id: I65e4ec53d906309914bf8e1b3420c2264c8f7370
2017-03-03 03:42:42 +00:00
Calin Juravle
d56d98b860 Merge changes from topic 'secondary-dex1'
* changes:
  Use DexManager logic to decide if a package is used by other apps
  Skip class path checking for secondary dex files
2017-03-03 03:42:34 +00:00
Calin Juravle
c98261b943 A bit more refactoring in BackgroundDexOptService am: a57ef16375 am: a0358c9e32
am: ff7bde0fa3  -s ours

Change-Id: I58955e558e574e01beaf40e5ecde994e79a3a2d4
2017-03-03 03:41:38 +00:00
Calin Juravle
2c1939b02e [PM] Clean up logic for secondary dex oat files am: e69fba3f7f am: 110e897eaa
am: 29f08b9f1b  -s ours

Change-Id: I9d1626a88d2d3743f2ca2c2493c8a46d3cbaf80c
2017-03-03 03:40:41 +00:00
Calin Juravle
2a65fd0d37 Compile secondary dex files in DexManager am: 7218363a92 am: 468be64cf2
am: 97b4de24d2  -s ours

Change-Id: I243bf467552438f5085b609a23d1a6161e28506b
2017-03-03 03:39:42 +00:00
Calin Juravle
876b2865d3 Notify DexManager about new package installs am: fcd672fca3 am: 27ea592098
am: a6adb97aa0  -s ours

Change-Id: Iaad413350849a6e1fc225d26d50977f5a4983f0f
2017-03-03 03:38:34 +00:00
Adam Lesinski
ac6edc501b AAPT2: Fix escaping sequence processing in XML parsing
Bug: 35483813
Test: make aapt2_tests
Change-Id: I68baba17ab3639c220b734a2a68d86aad0dedf8c
2017-03-02 19:32:32 -08:00
Svet Ganov
480b570603 Add a missing write lock to settings state.
Atomic file requires sync between writers otherwise we may end
up with partially written settings file and no backup to recover.

Test: not testable by how we hold a mutex

bug:35915719

Change-Id: I97eebf869fa7e4989dcd2a29e4418c22706edcb8
2017-03-03 03:01:34 +00:00
Svet Ganov
33d06fcac5 Fill-provider can control the negative button label and listener
Test: New CTS tests added and all autp-fill tests pass

bug:35869744

Change-Id: I55e5938038e612d728498658a763208f7022f85a
2017-03-03 02:58:18 +00:00
Svet Ganov
7ad1128137 Allow auto-fill services to disable themselves
1. Added a new API for a connected auto-fill service to
   disable itself

2. Added a new shell command to destroy all pending sessions
   which is used in CTS tests

3. Fixed a bug where the unbind timeout was in minutes
   instead of seconds

Test: wrote CTS tests, all auto-fill tests pass

bug:35848030

Change-Id: I681605aa0b8c004a0f14e30b57117c291d89a894
2017-03-03 02:56:32 +00:00
Mathias Agopian
bce1d3b60b Revert "Remove AHardwareBuffer_ API from libandroid"
This reverts commit 8e90cc3e3adf1d84b92b0b165193762cc8bb295d.

Both ANativeWindow and AHardwareBuffer need to be
available in libandroid (as well as libnativewindow)
otherwise it would make our developer’s life
very difficult when they want to support multiple
versions of android.

Moreover, this would have an impact on AndroidStudio
when doing an NDK project.

Test: compiled
Bug: treble

Change-Id: I2cc63b06b3f80fa80f7170ba2ba2996228fa9b2c
2017-03-02 18:55:39 -08:00
TreeHugger Robot
d11f127428 Merge "Make sure to call the original reply-to receiver when..." 2017-03-03 02:53:20 +00:00
TreeHugger Robot
75323c1889 Merge "Resize task to fullscreen when moving from pinned stack." 2017-03-03 02:37:28 +00:00
Calin Juravle
c649449093 Use DexManager logic to decide if a package is used by other apps
Stop relying on the file marker recorded by the runtime. We have the
same data available from the DexManager.

The clean up CL to remove the handling of the file markers will follow.

Test: verify that "shared packages" (e.g. gmscore) are not compiled with speed-profile.

Bug: 32871170

(cherry picked from commit 07b6eabe79261267ecd7114790e96e1f6828672a)

Change-Id: I2969b75fa77d38dde0073ef67aa89b1dc91237b5

Merged-In: I6cc5834ac88489e69896cd5fba9ed9968aa7f5a2
2017-03-03 02:16:04 +00:00
Calin Juravle
f8afcdc7b7 Skip class path checking for secondary dex files
Pass '&' marker to dex2oat classpath when compiling secondary dex files.
This will skip class path checking when loading the oat files.

Test: adb shell cmd package compile -m speed -f --secondary-dex com.google.android.gms
      oatdump --header-only --oat-
file=/data/user/0/com.google.android.gms/app_chimera/m/00000006/oat/arm64/DynamiteModulesC_GmsCore_prodmnc_alldpi_release
      check that the class path contains the special '&' marker

Bug: 32871170

(cherry picked from commit aae35767b6bca6f872c906a0fd38d7adb61217bd)

Change-Id: I7f3c6743e749316ee02e8586a525ad28ae1ef765

Merged-In: If0628aeb4e3f5717604bfc4a87a4b1d438e5fa65
2017-03-03 02:12:24 +00:00
Andrii Kulian
b43be0afff Compute merged configuration changes
When we compute configuration changes to decide whether to relaunch
an activity or just report a coniguration change, we were calculating
task override changes and global changes separately. This results in
incorrect set of detected changes if we're moving between the
displays. E.g. when moving from secondary display to the primary
a lot of override config values change from empty to non-empty.

This CL switches to calculating configuration changes for merged
task configuration (global + overrides).

In this second version switched to not marking change to undefined
value as an actual change when comparing configuration, so it will
behave similarly to Configuration#updateFrom. If new configuration
with undefined value is applied to an old one with corresponding
value already set, it won't be overwritten to undefined.

Bug: 34164473
Bug: 35911519
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testOnMovedToDisplayCallback
Change-Id: Ie1b90ccd2181aa5fdab4f57b9856e7de6959a6cb
2017-03-02 17:58:45 -08:00
TreeHugger Robot
5603a16e9e Merge "Fix issue #35365651: ActivityManager.getPackageImportance() doesn't..." 2017-03-03 01:50:15 +00:00
Adam Lesinski
8f7c550e20 AAPT2: Fix Plural::Equals() method
Test: make aapt2_tests
Bug: 35902437
Change-Id: I8797f89af58876f891f0b0c5cce85fd7781c4e24
2017-03-02 17:45:51 -08:00
Rob Carr
2ff633cbc3 Merge "Revert "Modify SurfaceView to use SurfaceFlinger child surfaces."" 2017-03-03 01:19:08 +00:00
Rob Carr
2e65f7c4e3 Merge "Revert "Correct dissapearing SurfaceView during exit animations."" 2017-03-03 01:17:04 +00:00
Rob Carr
115d2dbf93 Merge "Revert "SurfaceView: Include surfaceInsets in position calculation"" 2017-03-03 01:16:28 +00:00
Rob Carr
1c6d32ab10 Revert "Correct dissapearing SurfaceView during exit animations."
This reverts commit 026a6c45e77d3dec8f7ae26b74fe6fba18021caf.

Change-Id: I3ff0d64ca9f91aef4b5a53ed47e4d05f0d128e11
2017-03-03 01:15:48 +00:00
Rob Carr
8009012644 Revert "SurfaceView: Include surfaceInsets in position calculation"
This reverts commit 8c31e1db2a2cea4278503d6b9b27bca87946ef36.

Change-Id: Id25f493ca272878c2105f9cd302db1e05284998d
2017-03-03 01:15:36 +00:00
Makoto Onuki
3e7d845161 Make sure to call the original reply-to receiver when...
replacing a queued broadcast.

- Also don't replace a broadcast for a different user.

Test: Manual test with the following test code:

Intent intent = new Intent(Intent.ACTION_PROVIDER_CHANGED)
        .addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
AlarmManager alm = this.getSystemService(AlarmManager.class);
long time = SystemClock.elapsedRealtime() + 5 * 1000;
for (int i = 0; i < 5; i++) {
    alm.setExact(AlarmManager.ELAPSED_REALTIME, time,
            PendingIntent.getBroadcast(this, i, intent, PendingIntent.FLAG_UPDATE_CURRENT));
}

Without this CL, after the alarm fires, AlarmManagerService.mBroadcastRefCount
is left > 0 and the wake lock is held forever.

With this CL, mBroadcastRefCount eventually gets back to 0.

Bug: 35779096
Change-Id: I4e21c94b08f25f9ca1242182670ff4a69f8bd9f2
2017-03-02 16:58:14 -08:00
Jeff Tinker
3896db1475 Revert "Modify SurfaceView to use SurfaceFlinger child surfaces."
This reverts commit 693f3432ae77d1fcfaaf9d168de861192aacb4c4.

P0: When playing encrypted content the Fugu displays a blank screen.

Test: with topic "surfaceview-without-wm" reverted, encrypted playback
works on ToT oc-release. See repro steps in 35917840#12.

bug:35917840

Change-Id: I37fa1e427daff3a1c18ed1c92d035421d891f67c
2017-03-03 00:48:00 +00:00
Makoto Onuki
5eef50d86b Mention the relaxed security check on UM.isUserRunningOrStopping().
Bug: 35801468
Test: Javadoc only, make.
Change-Id: Iff44217b63e6ce8d354665719a84c37f8c2e569a
2017-03-02 16:38:45 -08:00
Elliott Hughes
b088dd5d15 Merge "Remove the name length limit for system properties." am: c657b769ab
am: 6f00e6e977

Change-Id: If2daf92e3b7aed37832aa0787a2c689d8bdedd97
2017-03-03 00:37:18 +00:00
Elliott Hughes
6f00e6e977 Merge "Remove the name length limit for system properties."
am: c657b769ab

Change-Id: I700b379c0482d7d9609183a39a5c9664746ea5aa
2017-03-03 00:30:10 +00:00
Calin Juravle
aa95700b54 Merge changes from topic 'secondary-dex' am: 9e88c53337
am: a400ccdaa0

Change-Id: I95ed98e02fe5a54699814eb617697852095ca55d
2017-03-03 00:29:42 +00:00
Calin Juravle
efb30d85a5 Save package dex usage info after secondary dex reconciliation am: 61fd6eab46
am: ade90057c6

Change-Id: I094a69564b25f84ed36b51b9064c4bb499088802
2017-03-03 00:28:38 +00:00
Calin Juravle
36bc489096 Compile secondary dex files during background dexopt job am: 574994afde
am: 112a61bf32

Change-Id: I2fd8f38ad11b9ba8e4eeff21b76356eb3c66a762
2017-03-03 00:27:44 +00:00
Calin Juravle
6f80bb4166 Add a shell command to force the background dexopt job am: f7edab63d9
am: 90ac28d618

Change-Id: I3fef4ed490036753841e09760ec929c24da0a198
2017-03-03 00:26:33 +00:00
Calin Juravle
ff7bde0fa3 A bit more refactoring in BackgroundDexOptService am: a57ef16375
am: a0358c9e32

Change-Id: Ie1e511761121f13bf106dd888129d5e3b168b818
2017-03-03 00:25:41 +00:00
Calin Juravle
29f08b9f1b [PM] Clean up logic for secondary dex oat files am: e69fba3f7f
am: 110e897eaa

Change-Id: I83d161595df4d1fee18652b8432a1950fb6f367d
2017-03-03 00:24:38 +00:00
Calin Juravle
97b4de24d2 Compile secondary dex files in DexManager am: 7218363a92
am: 468be64cf2

Change-Id: Ie0ebc07e2cf4fd4892b9171e1823d63414eef194
2017-03-03 00:23:39 +00:00
Calin Juravle
a6adb97aa0 Notify DexManager about new package installs am: fcd672fca3
am: 27ea592098

Change-Id: I3a71f8d4a6fcdad25b0b90a800d109bdeb16b3eb
2017-03-03 00:22:33 +00:00
Elliott Hughes
c657b769ab Merge "Remove the name length limit for system properties." 2017-03-03 00:22:31 +00:00
Calin Juravle
a400ccdaa0 Merge changes from topic 'secondary-dex'
am: 9e88c53337

Change-Id: I77e80eaf9274a64348c80b251e865ecdb6e53dbc
2017-03-03 00:13:57 +00:00
Calin Juravle
ade90057c6 Save package dex usage info after secondary dex reconciliation
am: 61fd6eab46

Change-Id: I90a95645e9d2acf1b2377e165a64b34b1a678295
2017-03-03 00:12:19 +00:00