Commit Graph

346780 Commits

Author SHA1 Message Date
Wale Ogunwale
35712aeaa8 Merge "Cache reference to stack objects we use a lot in AM." 2017-10-13 19:56:38 +00:00
TreeHugger Robot
d469600a2a Merge "mItarSpeedLimitExceeded thread safety" 2017-10-13 19:05:50 +00:00
TreeHugger Robot
f32edc9f65 Merge "Replace mNotifyAutofillManagerOnClick by mPrivateFlag." 2017-10-13 18:31:52 +00:00
TreeHugger Robot
02a20b7025 Merge "Added new ViewNode properties for Autofill (minEms, maxEms, maxLength)." 2017-10-13 18:13:04 +00:00
Hangyu Kuang
e76ee40093 Merge "recorder: Change the file read/write mode to be rw." 2017-10-13 18:11:19 +00:00
TreeHugger Robot
8a0f0ed4d8 Merge changes Ia6c335db,Id8079104
* changes:
  AssetManager2: Provide a method for iterating over packages
  AssetManager2: Implement IDMAP support
2017-10-13 17:27:39 +00:00
Adam Lesinski
d480f7ba8c AssetManager2: Provide a method for iterating over packages
Test: none
Change-Id: Ia6c335db1ed7d09cd444d387a29f18dc342a697f
2017-10-13 10:23:35 -07:00
Adam Lesinski
970bd8d283 AssetManager2: Implement IDMAP support
This enables RRO (runtime resource overlays) with AssetManager2

Test: make libandroidfw_tests
Test: out/host/<platform>/nativetest64/libandroidfw_tests/libandroidfw_tests --testdata=frameworks/base/libs/androidfw/tests/data
Change-Id: Id8079104faefbfaa3f4017d8f7ee1a8968f151a2
2017-10-13 10:23:34 -07:00
Donald Chai
a7963492dd Merge "AAPT: treat "-I" with lower precedence than main APK for dumping." 2017-10-13 16:40:03 +00:00
Felipe Leme
f39c3c1395 Replace mNotifyAutofillManagerOnClick by mPrivateFlag.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Bug: 67006548

Change-Id: I2027e5d6d952b473c4d20b2aac15792d230ae43c
2017-10-13 09:37:24 -07:00
Wale Ogunwale
a0f5b5ee1e Cache reference to stack objects we use a lot in AM.
This helps with fast access since we are no longer using stack ids
to look-up stack objects.
Also,
- Made ActivityDisplay.mStacks private so no one out the ActivityDisplay
class changing the stack list order.
- Changed some methods to pass stack objects vs. ids.

Test: Existing tests pass.
Test: go/wm-smoke
Change-Id: I04490cd505c4251e115043fa2ba5134d9a641846
2017-10-13 09:26:07 -07:00
Makoto Onuki
a96f6a0a14 Merge "Return canned messages from getDisabledMessage for..." 2017-10-13 15:53:18 +00:00
Charles He
fe932c78ec Merge "AM: introduce ActivityOptions.setLockTaskMode()." 2017-10-13 13:38:06 +00:00
TreeHugger Robot
f3c45363bf Merge "Cache reference to stack objects we use a lot in WM." 2017-10-13 13:20:30 +00:00
TreeHugger Robot
92ec65eee1 Merge "Migrating remaining core networking tests to Junit4" 2017-10-13 05:26:31 +00:00
TreeHugger Robot
4310433ad6 Merge "Various minor magnification improvements" 2017-10-13 05:12:44 +00:00
Donald Chai
d1ac6e1f9e AAPT: treat "-I" with lower precedence than main APK for dumping.
This is the desired behavior if resource IDs may overlap, and also happens to
improve the behavior of:

  aapt dump -I base.apk badging feature.apk

when both APKs use the same package name with different package IDs
(base=0x7F, feature=0x80).  Previously, the final call to
DynamicRefTable::addMapping was for base.apk, and all references to 0x80 were
rewritten in DynamicRefTable::lookupResourceId to 0x7F.  After this
change resources defined in both APKs are resolved correctly.

Note that this is a bit of kludge, and APKs should use different names
to avoid conflating the package IDs.

Fixes: 67070085
Bug: 64058531
Test: manual with sample in b/67070085#comment2
Change-Id: I285adb6f44a297440b08fc7a1f9ad73c700eb9bc
2017-10-12 21:34:22 -07:00
Yohei Yukawa
0f2512db60 Merge "Suppress warnings from AppOpsManager#checkPackage()" 2017-10-13 03:48:03 +00:00
TreeHugger Robot
8ff1a4b14c Merge "Fix identation in the switch block." 2017-10-13 03:21:57 +00:00
Hugo Benichi
3d6ba6ed6d Migrating remaining core networking tests to Junit4
Bug: 62918393
Test: runtest frameworks-net
Change-Id: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677
2017-10-13 12:16:32 +09:00
TreeHugger Robot
0f8970d7e6 Merge "Changing assist item strings to verbs" 2017-10-13 01:45:42 +00:00
TreeHugger Robot
fcf52c6f5e Merge "libandroidfw_tests: package test data correctly" 2017-10-13 01:14:34 +00:00
Wale Ogunwale
6191149c9c Cache reference to stack objects we use a lot in WM.
This helps with fast access since we are no longer using stack ids
to look-up stack objects.

Test: Existing tests pass.
Test: go/wm-smoke
Change-Id: I98cb6f4eb1e6d6acb81b2077aee03265a075a227
2017-10-12 18:09:44 -07:00
TreeHugger Robot
c3c2b28cb7 Merge "Remove unused recents freeform task code." 2017-10-13 00:54:04 +00:00
Yi Jin
7376615ca6 Merge "Implement Activity Manager Broadcasts dump protos" 2017-10-13 00:51:31 +00:00
Jordan Liu
1b904bb00b Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8 am: c04d233ac2 am: 23be5ee3de
am: 162d10d9dc  -s ours

Change-Id: I949db40fb3ade3fb929aab337a818ac4e0a5b3ab
2017-10-13 00:42:25 +00:00
TreeHugger Robot
f055302a73 Merge "Flags to enable/disable smart selection in EditText" 2017-10-13 00:33:44 +00:00
Jordan Liu
162d10d9dc Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8 am: c04d233ac2
am: 23be5ee3de

Change-Id: I5ea5156a5ea5541826ca1c6f4060fe7ccbfa1ff5
2017-10-13 00:30:00 +00:00
Abodunrinwa Toki
ae0df2e4c7 Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev am: bc0dc6dcba
am: 94ab358e5f  -s ours

Change-Id: I5c1b71f21c6d357dd6bafd57c2bbad6f6b814ec7
2017-10-13 00:22:47 +00:00
Jordan Liu
23be5ee3de Merge "Add a new carrier config to suppress AoC indication" am: db95dff0d8
am: c04d233ac2

Change-Id: Ic98c8f09bee42d8dba02c512b5543fb764105a92
2017-10-13 00:17:55 +00:00
Abodunrinwa Toki
94ab358e5f Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev
am: bc0dc6dcba

Change-Id: Ie40acfeebe656a3551900958ffb84f8897eb44c9
2017-10-13 00:12:43 +00:00
TreeHugger Robot
10cdc4206c Merge "Remove unused recents affiliated task code." 2017-10-12 23:59:21 +00:00
Jordan Liu
c04d233ac2 Merge "Add a new carrier config to suppress AoC indication"
am: db95dff0d8

Change-Id: If86b396f87e4f9f143f7abc02b4e05478693ade0
2017-10-12 23:58:55 +00:00
TreeHugger Robot
bc0dc6dcba Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev 2017-10-12 23:58:02 +00:00
TreeHugger Robot
8596362b7e Merge "Fix group divider make chrome crash issue." 2017-10-12 23:46:53 +00:00
Jordan Liu
db95dff0d8 Merge "Add a new carrier config to suppress AoC indication" 2017-10-12 23:42:17 +00:00
Omata Shou
29b132bff4 Add a new carrier config to suppress AoC indication
Some carriers require to suppress the AoC(Advice of Charge) indication.
This carrier config is used to disable the popup dialog which warns the
user of data charges.

Test: Passed make build
Bug: 65036581
Merged-In: Ibb8d548573c9c747c790722ee526fcd626b3fa67
Change-Id: Ibb8d548573c9c747c790722ee526fcd626b3fa67
2017-10-12 16:41:20 -07:00
TreeHugger Robot
478edb7604 Merge "Do not line-wrap dexopt status" 2017-10-12 23:27:56 +00:00
Adam Lesinski
873ef0e230 libandroidfw_tests: package test data correctly
- Convert to use soong, which allows bundling test data with benchmarks.
- Also separate libandroidfw_benchmarks so that it doesn't depend
on gtest.

Test: manual
Change-Id: I45bd222fafa87172c77b7f5bb2a7a89ddca72361
2017-10-12 16:02:00 -07:00
Abodunrinwa Toki
0e6b43ed58 Flags to enable/disable smart selection in EditText
1. smart_selection_enabled_for_edit_text
   Disables smart selection for editable text.
2. smart_selection_dark_launch
   Dark launch TextClassifierImpl.suggestSelection(...)
   In this mode we run the method, but never change the user's
   selection to measure the quality of the results based on what
   the user actually wanted.

Bug: 65959640
Test: Manually tested flags turn on/off feature with 'adb shell
settings put global' and GServices override.
Test: bit FrameworksCoreTests:android.provider.SettingsBackupTest
Change-Id: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
2017-10-12 23:50:53 +01:00
Makoto Onuki
b1588c0d39 Return canned messages from getDisabledMessage for...
shortcuts that haven't been restored.

Bug 62451035
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases

Change-Id: I8678adbbb7074bc28fe4b1b440fb11a6acfc9fdf
2017-10-12 15:43:09 -07:00
TreeHugger Robot
fac6655cf5 Merge "New Autofill API: SaveInfo.setTriggerId()" 2017-10-12 22:39:49 +00:00
TreeHugger Robot
b762f56e6b Merge "Add missing includes." 2017-10-12 22:19:48 +00:00
TreeHugger Robot
b43d18baf7 Merge "Updating documentation for setOnClickPendingIntent" 2017-10-12 22:09:06 +00:00
Rob Carr
53966760d7 Merge "Use new SurfaceFlinger transaction API." 2017-10-12 22:08:03 +00:00
Charles He
2bf2832047 AM: introduce ActivityOptions.setLockTaskMode().
This new API allows any activity to be launched into LockTask mode, as
if the package of the activity has declared "lockTaskMode =
if_whitelisted" in its manifest.

The lockTaskLaunchMode logic is also moved from TaskRecord to
ActivityRecord, in order to accommodate the new path from
ActivityOptions.

Bug: 66124180
Test: cts-tradefed run cts-dev --module DevicePolicyManager -t com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_deviceOwnerUser
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Test: manual, with TestDPC's kiosk mode
Change-Id: I786bf194ed20a212bbad1f3cdb9394cc77aa4d77
2017-10-12 23:03:30 +01:00
Yohei Yukawa
a965d65cd3 Suppress warnings from AppOpsManager#checkPackage()
AppOpsManager#checkPackage() is	the recommended API to check whether
a given package belongs to a certain UID or not.  You can check
whether a SecurityException is thrown or not to get the answer.

However, if the given package does not belong to the UID specified,
the app developer not only sees SecurityException but also sees the
warning in messages like below, which is a bit spammy and may actually
confuse QA team.

W AppOps  : Bad call: specified package com.android under uid 12345 but it is really -1
W AppOps  : java.lang.RuntimeException: here
W AppOps  :     at com.android.server.AppOpsService.getOpsRawLocked(AppOpsService.java:1330)
W AppOps  :     at com.android.server.AppOpsService.checkPackage(AppOpsService.java:1049)
W AppOps  :     at com.android.internal.app.IAppOpsService$Stub.onTransact(IAppOpsService.java:169)
W AppOps  :     at android.os.Binder.execTransact(Binder.java:696)

With this CL, AppOpsManager#checkPackage() no longer triggers the
above warnings in logcat.  Hopefully app developers do log something
in logcat if the package name / UID mismatch is actually unexpected.

This CL should have no semantic behavior change anyway.

Fixes: 67745316
Test: Locally verified by making the following API call.
        context.getSystemService(AppOpsManager.class)
                .checkPackage(12345, "com.android")
      While it still throws SecurityException, warning messages are
      no longer shown in the logcat.
Change-Id: Ic7af4ef84ad9e7ae5c0fbaa9cd1343f5443e8603
2017-10-12 15:02:26 -07:00
Tun Zheng
670ceded12 Fix group divider make chrome crash issue.
ListMenuItemView's group divider is only existed in
popup_menu_item_layout, but Chrome use list_menu_item_layout.
It will make NullPointerException and crash the chrome.
Fix it by check null before using the group divider.

Bug: 66987086
Test: Long click an image from webpage in chrome, click the "Download
image" item, and it works well.

Change-Id: Ie5f19194a968b4fff0126e1cf8bebda5344c8105
2017-10-12 21:55:54 +00:00
Android Build Merger (Role)
60d548786e Merge "Merge "Move to some properties users to libbase properties" am: 2b20612e77 am: 9e4bfdb0b6 am: 506f89a250 am: 0ca5b37250" 2017-10-12 21:46:48 +00:00
Tom Cherry
3c71e833b8 Merge "Move to some properties users to libbase properties" am: 2b20612e77 am: 9e4bfdb0b6 am: 506f89a250
am: 0ca5b37250

Change-Id: I82ba46567c1982e8bc4f90eb7a4c38a73dc15600
2017-10-12 21:45:09 +00:00