OSDN Git Service
TreeHugger Robot [Thu, 27 Apr 2017 21:44:50 +0000 (21:44 +0000)]
Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 21:35:42 +0000 (21:35 +0000)]
Merge "new reset carrier signals/actions" into oc-dev
Evan Rosky [Thu, 27 Apr 2017 21:28:08 +0000 (21:28 +0000)]
Merge "Only restrict arrows out of text fields from keyboard" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 21:23:35 +0000 (21:23 +0000)]
Merge "Use invalid package names for special keys in AccountManager." into oc-dev
Jorim Jaggi [Thu, 27 Apr 2017 20:57:03 +0000 (20:57 +0000)]
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
Sudheer Shanka [Thu, 27 Apr 2017 20:47:04 +0000 (20:47 +0000)]
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
Bryce Lee [Thu, 27 Apr 2017 20:41:32 +0000 (20:41 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
Sudheer Shanka [Thu, 27 Apr 2017 20:31:04 +0000 (20:31 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
Tima Vaisburd [Thu, 27 Apr 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:21:44 +0000 (20:21 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:10:49 +0000 (20:10 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
Makoto Onuki [Thu, 27 Apr 2017 20:03:16 +0000 (20:03 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 19:53:48 +0000 (19:53 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
Chad Brubaker [Thu, 27 Apr 2017 19:30:50 +0000 (19:30 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
Dmitry Dementyev [Wed, 26 Apr 2017 00:02:47 +0000 (17:02 -0700)]
Use invalid package names for special keys in AccountManager.
Bug:
37672088
Test: cts, manual.
Change-Id: I7fd40e0646a50f809b5c9b89dfe4242ceb00195d
TreeHugger Robot [Thu, 27 Apr 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 18:18:29 +0000 (18:18 +0000)]
Merge "Report correct display id in stack info" into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 18:09:13 +0000 (18:09 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
fionaxu [Wed, 26 Apr 2017 23:05:25 +0000 (16:05 -0700)]
new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.
Bug:
34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Pavel Grafov [Thu, 27 Apr 2017 13:22:26 +0000 (14:22 +0100)]
Use InetAddress instead of String in network events.
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.
Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.
Bug:
37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
TreeHugger Robot [Thu, 27 Apr 2017 17:34:43 +0000 (17:34 +0000)]
Merge "Revise method comment on setFontVariationSettings" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:28:28 +0000 (17:28 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26
am:
4ea763ad8a
Change-Id: I1b3005ef17b9d54e1f9b9c75138d214e80fc414c
Rubin Xu [Thu, 27 Apr 2017 17:24:56 +0000 (17:24 +0000)]
Merge "Reduce scrypt time in synthetic password flow" into oc-dev
Doris Liu [Thu, 27 Apr 2017 17:20:19 +0000 (17:20 +0000)]
Merge "Refine JavaDocs for AnimatorSet#getCurrentPlayTime()" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:19:21 +0000 (17:19 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489
am:
b1e3d9ab26
Change-Id: I4f2682c11384a9f656054b95cfba56132085634a
David Farrow [Thu, 27 Apr 2017 17:09:26 +0000 (17:09 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
am:
14826e5489
Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db
Mady Mellor [Thu, 27 Apr 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Improve swipe to show notification menu gesture" into oc-dev
David Farrow [Thu, 27 Apr 2017 17:01:09 +0000 (17:01 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Apr 2017 16:42:59 +0000 (16:42 +0000)]
Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 16:23:00 +0000 (16:23 +0000)]
Merge "Support profile global restrictions in disclosure messages." into oc-dev
Jorim Jaggi [Thu, 27 Apr 2017 12:30:39 +0000 (14:30 +0200)]
Implement API council feedback for dismissKeyguard
Test: KeyguardLockedTests CTS
Change-Id: Ibc6923ebe8363644e9b52b2b53b45d918124f52d
Fixes:
37673408
Julia Reynolds [Thu, 27 Apr 2017 15:11:32 +0000 (15:11 +0000)]
Merge "New constant for new settings screen." into oc-dev
Stefan Ramsauer [Thu, 27 Apr 2017 15:09:21 +0000 (15:09 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
Julia Reynolds [Sun, 23 Apr 2017 16:27:07 +0000 (12:27 -0400)]
New constant for new settings screen.
Bug:
36561295
Test: make
Change-Id: I0e2ec6d7b372a9594f8b583540804dde1b79de1a
Jason Monk [Thu, 27 Apr 2017 14:43:46 +0000 (14:43 +0000)]
Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
Jason Monk [Wed, 26 Apr 2017 18:35:24 +0000 (14:35 -0400)]
Revert "Status bar updates" DO NOT MERGE
Test: runtest systemui
Fixes:
37626598
This reverts commit
d1ba5fbb54a02fad0c68f71183078527bfa9bd49.
Change-Id: I12c70b67fafd46ec98b1c1ee28b911e19afbf6e5
George Mount [Thu, 27 Apr 2017 14:06:10 +0000 (14:06 +0000)]
Merge "Address API council feedback." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 13:50:52 +0000 (13:50 +0000)]
Merge "SmartSelection: Use downloaded model file." into oc-dev
Jason Monk [Thu, 27 Apr 2017 13:46:48 +0000 (13:46 +0000)]
Merge "Guard against incorrect context use." into oc-dev
Narayan Kamath [Thu, 27 Apr 2017 13:30:30 +0000 (13:30 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 13:26:21 +0000 (13:26 +0000)]
Merge "Create a metrics events for ag/
2085657 (DO disclosure screens)" into oc-dev
Denis Kuznetsov [Thu, 13 Apr 2017 09:41:33 +0000 (11:41 +0200)]
Create a metrics events for ag/
2085657 (DO disclosure screens)
Bug:
32692748
Test: Tests for functional changes are in ag/
2085657
Change-Id: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
Merged-In: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
(cherry picked from commit
7152a41d25f0296ec5ed41c497f7666e185890eb)
Michal Karpinski [Thu, 27 Apr 2017 10:52:40 +0000 (11:52 +0100)]
Reenable presubmit runs for BackupSettingsTest now that it's fixed
Bug:
37684646
Test: mmma -j40 frameworks/base/core/tests/coretests, then
adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk, then
adb shell am instrument -w -e class android.provider.SettingsBackupTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I1927c08e445b914b84b55d40aba68c234d6abcb5
Pavel Grafov [Fri, 21 Apr 2017 19:03:26 +0000 (20:03 +0100)]
Support profile global restrictions in disclosure messages.
Starting from Android O ENSURE_VERIFY_APPS can be enforced globally
by profile owners. To take this into account, this CL uses newer
UserManager API for getting a list of enforcing admins with their
userIds instead of just a mask.
Bug:
37158436
Test: manually
Change-Id: Id18b365668373b5aa28d59fcc4d662a2f5d133d8
Joachim Sauer [Thu, 27 Apr 2017 10:49:40 +0000 (10:49 +0000)]
Merge "Deprecate internal Calendar methods." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 09:41:08 +0000 (09:41 +0000)]
Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 09:41:08 +0000 (09:41 +0000)]
Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 07:26:09 +0000 (07:26 +0000)]
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 06:26:00 +0000 (06:26 +0000)]
Merge "Address API Council feedback." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:55:58 +0000 (05:55 +0000)]
Merge "Expose Companion API via shell command" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:24:46 +0000 (05:24 +0000)]
Merge "docs: Update EditText JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:21:17 +0000 (05:21 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev
Tima Vaisburd [Thu, 27 Apr 2017 04:59:12 +0000 (21:59 -0700)]
Hide getTextClassifier and setTextClassifier for WebView
Bug:
37724053
Test: Not needed, these methods have not been implemented.
Change-Id: I43c97cb13e80eeb13d53123a22230d5934b8a60d
TreeHugger Robot [Thu, 27 Apr 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Autofill binding permission fixes." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:51:37 +0000 (04:51 +0000)]
Merge "Api updates" into oc-dev
Peng Xu [Thu, 27 Apr 2017 04:49:11 +0000 (04:49 +0000)]
Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:46:29 +0000 (04:46 +0000)]
Merge "Fix volume key events are dispatched when screen is off" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:29:09 +0000 (04:29 +0000)]
Merge "docs: Update ScrollView JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:28:31 +0000 (04:28 +0000)]
Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:22:20 +0000 (04:22 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:21:09 +0000 (04:21 +0000)]
Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:12:44 +0000 (04:12 +0000)]
Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:59:53 +0000 (03:59 +0000)]
Merge "Blame services for slow operations" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:51:29 +0000 (03:51 +0000)]
Merge "Add device ID attestation method to keymaster" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:50:47 +0000 (03:50 +0000)]
Merge "Call getAllowedUid on a separate thread" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:45:50 +0000 (03:45 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
Adrian Roos [Wed, 26 Apr 2017 17:43:21 +0000 (10:43 -0700)]
SysUI A11y: Fix keyguard time utterance
The fancy colon on keyguard is causing issues for TalkBack.
Fixed by replacing it with a regular colon in accessibility infos.
Change-Id: Id4802a8dc422f2abb523dbbf887291d5983fd4ee
Fixes:
34949557
Test: runtest -x /frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java
Test-Manual: Enable talkback, make sure that lockscreen time is read out correctly
Svetoslav Ganov [Thu, 27 Apr 2017 03:01:55 +0000 (03:01 +0000)]
Merge "Drop uses-feature requirement for system process" into oc-dev
songjinshi [Wed, 15 Mar 2017 08:16:05 +0000 (16:16 +0800)]
[Stability]: fix system_server crash issue caused by fd leak.
If an app incorrect use of registerListener, it will cause
system_server socket fd leak, for example:
protected void onResume() {
super.onResume();
mSensorManager.registerListener(new MySensorEventListener(),
mSensor, SensorManager.SENSOR_DELAY_UI);
Each time a new SensorEventQueue, then in the system_server
will open a new socket fd, as time increases system_server's
fd will be more than 1024 and crash, so we needed add count limit
for sensor listener to improve the system stability.
Test: use the apk attached in the issue
https://code.google.com/p/android/issues/detail?id=258634
Bug:
37543280
Change-Id: I35006966a1638c25bb0f54611e117e16a764e12b
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Svet Ganov [Thu, 27 Apr 2017 01:49:30 +0000 (18:49 -0700)]
Handle package changes in autofill manager service
Autofill manager service was not observing package changes thus
we did not properly handle the cases of the service being updated,
added, and removed. Handling, additions is needed to properly
support restore from a backup. Fixed a few missing locks.
Test: all autofill CTS tests pass and manually tested update, add,
and remove of autofill services.
bug:
36638606
bug:
36978445
Change-Id: Idd47891774ba2a4e562a1952cbb5a048211fd4e3
Andrii Kulian [Thu, 27 Apr 2017 01:33:28 +0000 (18:33 -0700)]
Report correct display id in stack info
Bug:
37101202
Test: adb shell am stack list
Change-Id: I16ace089f8bae5ec1090b27e9d9a59657e9496dd
Daniel Sandler [Thu, 27 Apr 2017 01:23:52 +0000 (01:23 +0000)]
Merge "Avoid ClassCastException in ArrayMap." into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 01:09:54 +0000 (18:09 -0700)]
Hide onMovedToDisplay callback
There are no usages in O, so not exposing it for now.
Bug:
37638275
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I30a8549191ac1cfad0fb1e4db71a702862c0e503
Felipe Leme [Thu, 27 Apr 2017 00:42:38 +0000 (17:42 -0700)]
Autofill binding permission fixes.
- Removed deprecated BIND_AUTO_FILL
- Renamed BIND_AUTOFILL to BIND_AUTOFILL_SERVICE
- Kept BIND_AUTOFILL as @hide
- Fixed the permission code
The permission check was actually ignored; it was probably broken when we
introduced support to settings.
Fixes:
37723410
Bug:
37563972
Test: manual verification with existing client
Test: CtsAutoFillServiceTestCases pass
Change-Id: If3abdcb0ae850f0a327bfdbb9ca6c44a24823047
Andrii Kulian [Thu, 27 Apr 2017 00:46:05 +0000 (00:46 +0000)]
Merge "Check only task's override config for adjusting bounds" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 00:33:16 +0000 (00:33 +0000)]
Merge "Temporary tracking of JobStatus unprepare" into oc-dev
Winson Chung [Wed, 26 Apr 2017 21:02:13 +0000 (14:02 -0700)]
Fixing issue with lingering dismiss PiP overlay.
- Always try and remove the dismiss overlay when animating touch ends, or
if the input consumer is unregistered to handle cases where the
interaction is interrupted by the pip animation.
Bug:
37309693
Test: Intermittent, enter pip and try to tap and then tap-drag the PIP
Change-Id: I05f360f1d9d264590725e13eb2cc9254a3f21eef
Winson Chung [Wed, 26 Apr 2017 15:46:24 +0000 (08:46 -0700)]
Fix issue with dismiss scrim not spanning full screen
Bug:
37309741
Test: Launch PIP activity, go to landscape, drag and ensure dismiss
overlay spans fullscreen
Change-Id: I449c9f2bdaf01357ebdb652665e884c1ada5ea46
Winson Chung [Tue, 25 Apr 2017 21:43:10 +0000 (14:43 -0700)]
Prevent IME adjustment for stacks not affected by docked stack resizing
Bug:
37358175
Test: Resize docked stack while PIP is up
Change-Id: I4f057f6671e8c164624359bf3532f9a22fdf768e
Winson Chung [Tue, 25 Apr 2017 18:00:48 +0000 (11:00 -0700)]
Updating PiP API and documentation.
- Renaming PictureInPictureArgs to PictureInPictureParams, making it
immutable and built with a builder class. In addition, making the
aspect ratio rational.
- Moving the check to get max number of actions to the activity to have
more flexibility going forward
- Also ensures that enterPictureInPictureMode() returns true if the
activity is already in PiP mode.
- Will follow up with CL to remove PictureInPictureArgs and related methods
once this CL drops
Bug:
35765211
Bug:
37638323
Bug:
37637423
Bug:
37636674
Bug:
36342780
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: android.app.cts.PictureInPictureParamsBuilderTest
Change-Id: I54a487d55a59c9ce8ac7bd6c80c61209c8b26224
Signed-off-by: Winson Chung <winsonc@google.com>
Felipe Leme [Wed, 26 Apr 2017 23:46:16 +0000 (23:46 +0000)]
Merge "Provide support for optimized ACTION_REQUEST_SET_AUTOFILL_SERVICE." into oc-dev
Makoto Onuki [Wed, 26 Apr 2017 23:33:56 +0000 (23:33 +0000)]
Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:26:43 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:25:49 +0000 (23:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Apr 2017 23:24:27 +0000 (23:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 23:19:51 +0000 (23:19 +0000)]
Merge "Font API clean up" into oc-dev
Makoto Onuki [Wed, 26 Apr 2017 23:18:43 +0000 (23:18 +0000)]
Merge "Only show progress log every 10%" into oc-dev
Makoto Onuki [Wed, 26 Apr 2017 21:38:18 +0000 (14:38 -0700)]
Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26
Also make sure to return the legacy value from
RunningAppProcessInfo.importance.
Bug:
37636026
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 CtsAppTestCases -t 'android.app.cts.ActivityManagerTest#testGetRunningAppProcesses'
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 CtsAppTestCases -t 'android.app.cts.ActivityManagerTest#testGetMyMemoryState'
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 CtsAppTestCases -t 'android.app.cts.AlertWindowsTests'
Change-Id: Ie04e4dfa40c28ea391ae5ce3c769c6f8ee70a43d
Christopher Tate [Wed, 26 Apr 2017 22:41:37 +0000 (15:41 -0700)]
Temporary tracking of JobStatus unprepare
For help diagnosing bug
37209909
Test: manual
Change-Id: If93ee0d25f462d5c8e954d3d7cbdc280b5d18c7e
Tony Mak [Tue, 25 Apr 2017 08:29:55 +0000 (09:29 +0100)]
setAffiliationIds and getAffiliationIds uses set instead of list
Didn't use @remove because java doesn't support two methods differs from
the return type only.
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_unaffiliatedUser
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest
Change-Id: Ic7c7221ef5e680a6765f028c2ab73d4c2f908c58
Fix:
37622682
Doris Liu [Wed, 26 Apr 2017 18:09:43 +0000 (11:09 -0700)]
Refine JavaDocs for AnimatorSet#getCurrentPlayTime()
This is to address API concil's feedback.
BUG:
37673139
Test: make -j20 docs
Change-Id: I2e360c7996f8368c77c30c55271e006f94736f90
Sudheer Shanka [Wed, 26 Apr 2017 21:49:16 +0000 (14:49 -0700)]
Rename ActivityMonitor.onMatchIntent to onStartActivity.
Fixes:
37672383
Test: cts-tradefed run singleCommand cts-dev --module CtsAppTestCases -t \
android.app.cts.Instrumentation_ActivityMonitorTest
Change-Id: Ic3fdba576232f0a05454dde8ea482ea714aeee3d
Conrad Chen [Wed, 26 Apr 2017 21:47:55 +0000 (21:47 +0000)]
Merge "TIF: fix javadoc of recorded programs" into oc-dev
Rob Carr [Wed, 26 Apr 2017 21:43:51 +0000 (21:43 +0000)]
Merge "More targeted version of "Correct animation glitch for pinned stack."" into oc-dev
Rob Carr [Wed, 26 Apr 2017 21:43:25 +0000 (21:43 +0000)]
Merge "Fix logspam NPE." into oc-dev
George Mount [Wed, 26 Apr 2017 20:10:59 +0000 (13:10 -0700)]
Address API council feedback.
Bug
37636027
Change FragmentTransaction#setAllowOptimization() to
FragmentTransaction#setReorderingAllowed().
Test: I729dc05bde1f6eba6ff8d38eb15f65de777c14bb
Change-Id: I24c35aad95ffa14d2e2fa092ae71d3d459e6d648
TreeHugger Robot [Wed, 26 Apr 2017 21:28:23 +0000 (21:28 +0000)]
Merge "Fix BackupSettingsTest (update blacklists)" into oc-dev
Android Build Merger (Role) [Wed, 26 Apr 2017 21:07:59 +0000 (21:07 +0000)]
Merge "DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517 am:
a701205315 -s ours" into oc-dev
Alison Cichowlas [Wed, 26 Apr 2017 21:07:49 +0000 (21:07 +0000)]
Merge "Use uptimeMillis instead of currentTimeMillis for interval calculation." into oc-dev
Julius D'souza [Wed, 26 Apr 2017 21:06:55 +0000 (21:06 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517
am:
a701205315 -s ours
Change-Id: I001aea36b99da8cf3c209fb3c5c316200b0d08a2