OSDN Git Service
Bryce Lee [Wed, 25 Oct 2017 22:54:55 +0000 (15:54 -0700)]
Add tests to exercise ActivityStarter precondition failures.
This changelist adds tests which simulate various scenarios
encountered during the initial stages of starting an activity. They
ensure that the expected errors are returned under specified
conditions.
Bug:
64750076
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStarterTests
Change-Id: I93fef3dce020fe03a8b2001b75a875980506a0dd
Bryce Lee [Fri, 27 Oct 2017 17:57:35 +0000 (10:57 -0700)]
Make ActivityStackSupervisor instrumentable for unit tests.
Currently, the ActivityStackSupervisor passes an instance of itself
during construction to a number of its member variables. Passing
a self reference at this time leads to an incomplete object being
passed. In the case of testing, it's possible for the instance to be
copied after construction for instrumentation, leading to the
original instance being retained.
This changelist addresses this by moving the creation of these
variables to a separate initialize methods. In addition, the affected
variables accessed outside the class are now behind accessors to
prevent their modification.
Bug:
64750076
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStarterTests
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingBoundsControllerTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingActivityPositionerTests
Test: bit FrameworksServicesTests:com.android.server.am.LaunchingTaskPositionerTests
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
Change-Id: I19647b24925b82db0ab0955585d7588a28e00f94
TreeHugger Robot [Tue, 14 Nov 2017 02:59:12 +0000 (02:59 +0000)]
Merge "Support insets on secondary displays"
Xiangyu/Malcolm Chen [Tue, 14 Nov 2017 02:51:21 +0000 (02:51 +0000)]
Merge "Move Ims related settings from global setting to subscription db."
TreeHugger Robot [Tue, 14 Nov 2017 02:22:34 +0000 (02:22 +0000)]
Merge "incidentd: Updating Settings Provider proto dump."
TreeHugger Robot [Tue, 14 Nov 2017 02:05:37 +0000 (02:05 +0000)]
Merge "Listen for launcher package added to connect to it faster"
Fyodor Kupolov [Tue, 14 Nov 2017 01:34:17 +0000 (01:34 +0000)]
Merge "Additional System APIs for restricted profiles"
Calin Juravle [Tue, 14 Nov 2017 01:30:10 +0000 (01:30 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path"
TreeHugger Robot [Tue, 14 Nov 2017 01:11:54 +0000 (01:11 +0000)]
Merge "Unit tests for ValueMetricProducer StatsPullerManager is refactored so that we can mock it. It may need more refactor pass to make is safer for longer runs."
Wale Ogunwale [Tue, 14 Nov 2017 01:01:29 +0000 (01:01 +0000)]
Support insets on secondary displays
Indroduced DisplayFrames object to track frames used to calculate
window insets per display vs. at a global level in PhoneWindowManager.
Bug:
64148922
Change-Id: I19f166920eba0a4f933a223a77e096bcc8dab0c1
Test: bit FrameworksServicesTests:com.android.server.wm.ScreenDecorWindowTests
Test: go/wm-smoke
TreeHugger Robot [Tue, 14 Nov 2017 00:56:25 +0000 (00:56 +0000)]
Merge "Fix for incorrect model version info"
Wei Jia [Tue, 14 Nov 2017 00:55:44 +0000 (00:55 +0000)]
Merge "MediaPlayer: simplify buffering control."
TreeHugger Robot [Tue, 14 Nov 2017 00:41:58 +0000 (00:41 +0000)]
Merge "Apps targeting P need phone pemrisison to get device serial - framework"
Kweku Adams [Tue, 31 Oct 2017 22:32:09 +0000 (15:32 -0700)]
incidentd: Updating Settings Provider proto dump.
Handling potential null cases, adding comments, logging new settings,
and dumping historical operations.
Bug:
65750829
Test: flash device and check incident.proto output
Change-Id: I66fe324a91fba136e73761cfb74f3527de75d3ad
TreeHugger Robot [Tue, 14 Nov 2017 00:01:48 +0000 (00:01 +0000)]
Merge "Adding metric vals dnd settings"
Pierre Lecesne [Mon, 13 Nov 2017 23:52:28 +0000 (23:52 +0000)]
Merge "AAPT2 - Convert command to copy all the files."
Jaekyun Seok [Mon, 13 Nov 2017 23:38:03 +0000 (23:38 +0000)]
Merge "Add AgnssRil initialization"
TreeHugger Robot [Mon, 13 Nov 2017 22:41:23 +0000 (22:41 +0000)]
Merge changes I0d090d52,I77296f91
* changes:
Anchor the volume dialog to hardware keys.
Switch default stream from RING to MUSIC.
Svet Ganov [Mon, 13 Nov 2017 19:52:22 +0000 (11:52 -0800)]
Apps targeting P need phone pemrisison to get device serial - framework
Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.PermissionsHostTest#testSerialAccessPolicy
bug:
30978688
Change-Id: I2f65cd556798e20d1b029fbcf151d09f818c1bda
TreeHugger Robot [Mon, 13 Nov 2017 22:34:34 +0000 (22:34 +0000)]
Merge "Deprecate framework Fragments and Loaders"
Beverly [Fri, 3 Nov 2017 21:27:02 +0000 (17:27 -0400)]
Adding metric vals dnd settings
Test: N/A
Bug:
63077372
Change-Id: I31ec9eea46193806cbb97bcc0c9924aae45e02f0
Mike Ma [Mon, 13 Nov 2017 22:24:40 +0000 (22:24 +0000)]
Merge "Add instrumentation data to host proto lib"
TreeHugger Robot [Mon, 13 Nov 2017 22:11:49 +0000 (22:11 +0000)]
Merge "Fix leak of FILE* in dumping"
Mehdi Alizadeh [Mon, 13 Nov 2017 22:04:58 +0000 (22:04 +0000)]
Merge "Adds definitions for soft AP metrics in wifi.proto"
Jaekyun Seok [Mon, 13 Nov 2017 06:03:21 +0000 (15:03 +0900)]
Add AgnssRil initialization
Bug:
64841550
Bug:
64278167
Test: succeeded building and tested on sailfish
Change-Id: I3c949ea9bf441bf98139f0007cd1849b30dfeaca
TreeHugger Robot [Mon, 13 Nov 2017 21:43:56 +0000 (21:43 +0000)]
Merge "Revert "Support insets on secondary displays""
Chenjie Yu [Thu, 9 Nov 2017 18:50:09 +0000 (10:50 -0800)]
Unit tests for ValueMetricProducer
StatsPullerManager is refactored so that we can mock it.
It may need more refactor pass to make is safer for longer runs.
Test: unit test
Change-Id: Ief0c99710e4d06e1454678f8b749c9599467d114
Pierre Lecesne [Fri, 10 Nov 2017 22:31:01 +0000 (22:31 +0000)]
AAPT2 - Convert command to copy all the files.
Test: Manual
Change-Id: I8705966cb34ff41eb362126a35956720147fae91
TreeHugger Robot [Mon, 13 Nov 2017 20:31:52 +0000 (20:31 +0000)]
Merge "Sync PRIV_APP_OOB_ENABLED setting to pm.dexopt.priv-apps-oob"
TreeHugger Robot [Mon, 13 Nov 2017 20:30:58 +0000 (20:30 +0000)]
Merge "Add api lint to upload checks"
Dmitry Dementyev [Mon, 13 Nov 2017 20:16:52 +0000 (20:16 +0000)]
Merge "Get rid of manually created IKeystoreService."
Mike Ma [Mon, 13 Nov 2017 20:06:45 +0000 (12:06 -0800)]
Add instrumentation data to host proto lib
Add instrumentation data proto to host proto lib and add a few comment
to am instrument.
Test: no test needed
Change-Id: Ibbb0394dcf0ad27b53d5c97104456798863ce82c
TreeHugger Robot [Mon, 13 Nov 2017 20:11:49 +0000 (20:11 +0000)]
Merge "Don't show "always use" when app can't be default"
TreeHugger Robot [Mon, 13 Nov 2017 20:02:41 +0000 (20:02 +0000)]
Merge "Change conditional keep rule syntax"
Mehdi Alizadeh [Wed, 18 Oct 2017 22:42:35 +0000 (15:42 -0700)]
Adds definitions for soft AP metrics in wifi.proto
Adds definitions for soft AP metrics related to number of connected
clients and soft AP sessions
Bug:
68712260
Test: None
Change-Id: I515afd215a04fd50b0045fa1d81eebb9354f7bb2
John Reck [Mon, 13 Nov 2017 19:32:39 +0000 (11:32 -0800)]
Fix leak of FILE* in dumping
Avoid fdopen as fclose, which frees the FILE*, will close
the FD which we don't want. Just normalize on dprintf instead,
and we can add buffering if it turns out to matter at some point
Test: ran 'dumpsys gfxinfo framestats' in a loop while observing PSS
Change-Id: I7808753641aa1055cfdf570c3e017017f11f1dee
Seigo Nonaka [Sat, 11 Nov 2017 00:02:17 +0000 (00:02 +0000)]
Revert "Store FontCollection in MinikinPaint"
This regresses the performance.
Bug:
69165958
This reverts commit
c0a35e7b0ecbd35c9c39205fec6ef2555e86db8b.
Change-Id: I86f0b55dc83fdde4ca04659ec0f7bb3589f571fa
Ian Lake [Mon, 13 Nov 2017 18:26:46 +0000 (10:26 -0800)]
Deprecate framework Fragments and Loaders
Redirect developers to use the Support Library
versions of Fragments and Loaders to ensure that
they get consistent behavior across versions of
Android and all devices as well as access to
Lifecycle improvements.
Test: Confirmed APIs deprecated in current.txt
BUG:
68381801
Change-Id: I58ec599e557fc93c8547c45ba7c9ced96b0c8616
Jason Monk [Fri, 10 Nov 2017 20:43:17 +0000 (15:43 -0500)]
Add api lint to upload checks
Currently will never block upload, only considered a warning, but
will print out any lint issues discovered.
Test: do an upload
Bug:
69115822
Change-Id: I69b8e5a3f92ac28ee3c954408e88a1056c33af65
Julia Reynolds [Wed, 8 Nov 2017 16:19:09 +0000 (11:19 -0500)]
Anchor the volume dialog to hardware keys.
Test: manual
Bug:
63096355
Change-Id: I0d090d524cb88f3c1c353de5b096b665657f05cf
Victor Hsieh [Tue, 7 Nov 2017 19:12:51 +0000 (11:12 -0800)]
Sync PRIV_APP_OOB_ENABLED setting to pm.dexopt.priv-apps-oob
The settings value is used as a proxy for server side experiment to
populate configuration to the device. This is only for experiment and
should be removed later.
Test: adb shell settings put global priv_app_oob_enabled 0
# saw pm.dexopt.priv-apps-oob changed to false
Test: adb shell settings put global priv_app_oob_enabled 1
# saw pm.dexopt.priv-apps-oob changed to true
Bug:
67415855
Bug:
63920015
Change-Id: I4eb2beb14cd2c86c4bfc439d9742e95d3aba45a9
Wale Ogunwale [Mon, 13 Nov 2017 16:49:19 +0000 (16:49 +0000)]
Revert "Support insets on secondary displays"
This reverts commit
9bc2692939d4dececbfde5ea67df4594a7842bd1.
Change-Id: Ia065372e9e220e653b4729a290663c3536d99307
Fixes:
69241956
Bug:
64148922
Julia Reynolds [Tue, 7 Nov 2017 15:33:08 +0000 (10:33 -0500)]
Switch default stream from RING to MUSIC.
When changing volume.
Test: manual, cts
Bug:
63096355
Change-Id: I77296f91c58b1e5f0169fc1699e27b80b391408a
Jan Althaus [Mon, 13 Nov 2017 11:07:04 +0000 (12:07 +0100)]
Fix for incorrect model version info
In a number of cases, the model version info was not set correctly,
resulting in incorrect model version information (always 0) being
logged.
Bug:
69240688
Test: Manually tested that the logs are correct. (Both with only factory and only update model)
Change-Id: I89e88635eecd4e4a3f299b2cf5cdd09d6ff53bdf
Jan Althaus [Mon, 6 Nov 2017 11:31:59 +0000 (12:31 +0100)]
Update smart select metrics for new system event fields
We are now adding new system UI event fields specifically for smart select.
This CL adds corresponding new metric field values and changes the log
event building accordingly.
Bug:
67674199
Test: Manually tested that the logs are correct.
Change-Id: I5b90c8b194de2d46d7d6be1f1c314be9a2239298
TreeHugger Robot [Mon, 13 Nov 2017 06:43:44 +0000 (06:43 +0000)]
Merge "Introduce CrossProfileApps API"
Wei Jia [Fri, 10 Mar 2017 17:52:26 +0000 (09:52 -0800)]
MediaPlayer: simplify buffering control.
Test: pass cts tests
Bug:
36280094
Change-Id: If1e2dac511d038b88f7e867eb7ff8b345cb04478
Chenjie Yu [Tue, 7 Nov 2017 01:56:44 +0000 (17:56 -0800)]
add CpuTimePerUidPuller and CpuTimePerUidFreqPuller
Note: these pullers return monotonically increasing numbers.
The uids could include isolated uids that needs further translation in
statsd.
Test: manually tested on device and check print outs
Change-Id: I7097aec0417a3ac567b9b86149b757ac27cd58d8
Chenjie Yu [Fri, 3 Nov 2017 16:33:15 +0000 (09:33 -0700)]
pull cpu time per freq
also adjust lock for ValueMetricProducer.cpp
Test: manual test
Change-Id: Ib96e3011d7bcf44ac92346d880196c425623a86f
TreeHugger Robot [Sat, 11 Nov 2017 03:44:38 +0000 (03:44 +0000)]
Merge "Implement Cpu Info Section"
TreeHugger Robot [Sat, 11 Nov 2017 03:32:40 +0000 (03:32 +0000)]
Merge "Inform WindowManager when Activity is reordered to front."
Chih-hung Hsieh [Sat, 11 Nov 2017 02:32:01 +0000 (02:32 +0000)]
Merge "Use -Werror in frameworks/base/core/tests/webkit/apk_with_native_libs"
Yi Jin [Thu, 2 Nov 2017 00:08:27 +0000 (17:08 -0700)]
Implement Cpu Info Section
Support carriage return in Read class, and add a new way to parse lines
which is not able to split purly by delimiters
Bug:
65642861
Test: unit test and on device test
Change-Id: Ib82dd4e458bb7d2fa33462b23fbe11b828325916
TreeHugger Robot [Sat, 11 Nov 2017 01:22:55 +0000 (01:22 +0000)]
Merge "Create magnifier bench scene"
TreeHugger Robot [Sat, 11 Nov 2017 01:18:12 +0000 (01:18 +0000)]
Merge "Revert "Eliminate native/JNI/callback USB Descriptor parsing mechanism""
TreeHugger Robot [Sat, 11 Nov 2017 01:03:59 +0000 (01:03 +0000)]
Merge "make statsd less chatty."
Bryce Lee [Fri, 8 Sep 2017 22:55:22 +0000 (15:55 -0700)]
Inform WindowManager when Activity is reordered to front.
This event was captured on the ActivityManager side through
TaskRecord::moveActivityToFrontLocked. However, this change was
not conveyed to the WindowManager, leading to potential issues, such
as sending key events to the wrong Activity.
Change-Id: Ia5cf3dc0f2dac8fa10adc775c2ebb08beee0c064
Fixes:
65031003
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerActivityVisibilityTests#testReorderToFrontBackstack
(cherry picked from commit
c033f8de620db59ff94ef905a4ab66ac3e212c06)
TreeHugger Robot [Sat, 11 Nov 2017 00:46:54 +0000 (00:46 +0000)]
Merge "1. Add FIELD_COUNT_REPEATED bit masks to repeated fields that were previously missing 2. Resolve segfault when serializing proto into vector of uint8_t 3. Add a local byte size variable for EventMetric data as we cannot call size() of ProtoOutputStream before we finish writing. 4. Replace hardcoded conversion of second to nano second with NS_PER_SEC"
Matthew Ng [Fri, 10 Nov 2017 22:06:29 +0000 (14:06 -0800)]
Listen for launcher package added to connect to it faster
When launcher is reinstalled, it may take time for it to get ready and
to reconnect to. If not available immediately it would try to connect it
later after a timeout. Instead of waiting, receive a broadcast when it
gets installed to connect immediately.
Test: manual - reinstall launcher
Bug:
67957962
Change-Id: I1e531db9646d11a1eae99abe46d5e6f852c5eeda
TreeHugger Robot [Sat, 11 Nov 2017 00:28:02 +0000 (00:28 +0000)]
Merge "Updating MediaStore to support localized audio titles"
Patrick Plunkett [Fri, 10 Nov 2017 23:27:26 +0000 (23:27 +0000)]
Merge "Allow activities on secondary displays to dismiss keyguard"
John Reck [Fri, 10 Nov 2017 23:06:32 +0000 (15:06 -0800)]
Create magnifier bench scene
Test: this
Change-Id: Iea1033fda55ff0946b5cd8d28ecba29453b937ca
Chih-Hung Hsieh [Fri, 10 Nov 2017 22:53:00 +0000 (14:53 -0800)]
Use -Werror in frameworks/base/core/tests/webkit/apk_with_native_libs
* Comment out unused parameter names.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: If58bb6098f92e78400c71e7418a956a08bab6c36
Yao Chen [Fri, 10 Nov 2017 22:35:58 +0000 (14:35 -0800)]
make statsd less chatty.
Test: builds and adb logcat
Change-Id: I06ee9cce1844b21ed3960bbaf76262fca3357bf4
TreeHugger Robot [Fri, 10 Nov 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Fixed a NP when clearing notifications"
TreeHugger Robot [Fri, 10 Nov 2017 21:50:03 +0000 (21:50 +0000)]
Merge "Fixes the connection listener wrong thread crash for overview proxy"
Jakub Pawlowski [Fri, 10 Nov 2017 21:38:51 +0000 (21:38 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)"
TreeHugger Robot [Fri, 10 Nov 2017 21:31:53 +0000 (21:31 +0000)]
Merge "Change pm.dexopt.priv-apps to .priv-apps-oob"
TreeHugger Robot [Fri, 10 Nov 2017 21:30:32 +0000 (21:30 +0000)]
Merge "Fix NPE for devices without StatusBar implementation."
TreeHugger Robot [Fri, 10 Nov 2017 21:26:53 +0000 (21:26 +0000)]
Merge "Consider only the top most stacks for visibility test"
TreeHugger Robot [Fri, 10 Nov 2017 20:56:02 +0000 (20:56 +0000)]
Merge "DND behavior system sounds cannot bypass DND"
Hall Liu [Fri, 10 Nov 2017 20:16:00 +0000 (20:16 +0000)]
Merge "Update Telecom APIs to include multi-hfp" am:
025718e8f6 am:
3dd41b7b29
am:
518a82c94a
Change-Id: I0309cfd98f38a54b741a9dc09d1fb65159d5a4b7
Pierre Lecesne [Fri, 10 Nov 2017 20:09:47 +0000 (20:09 +0000)]
Merge "Refactor Convert command to use a ISerializer interface."
Hall Liu [Fri, 10 Nov 2017 20:07:15 +0000 (20:07 +0000)]
Merge "Update Telecom APIs to include multi-hfp" am:
025718e8f6
am:
3dd41b7b29
Change-Id: I27922fafa9c092e281c80fc6aa5f96c8e4e0c461
Hall Liu [Fri, 10 Nov 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
am:
025718e8f6
Change-Id: I08e0646c4dc20d45ea50d43d7e8b0deddf147bda
Hall Liu [Fri, 10 Nov 2017 19:49:01 +0000 (19:49 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
Derek Sollenberger [Fri, 10 Nov 2017 19:44:42 +0000 (19:44 +0000)]
Merge "Fix bug in View system recording where Skia dropped the colorFilter."
Matthew Ng [Fri, 10 Nov 2017 19:27:29 +0000 (11:27 -0800)]
Fixes the connection listener wrong thread crash for overview proxy
Sending connection callbacks from binder thread crashes any layouts
called from the listener. Use the original handler to post connections
to fix this crash.
Bug:
67957962
Test: manual, reinstall launcher to re-establish the connection
Change-Id: I958d86346c41cbf1e9a0dc8bdeae957ec64f8a55
Adam Koski [Fri, 10 Nov 2017 19:15:55 +0000 (11:15 -0800)]
Change conditional keep rule syntax
Google's ProGuard fork is migrating to a new syntax that upstream
ProGuard 6.0 will also support.
Test: unit tests
Bug:
69162105
Change-Id: I3b6d7e82eb99c2e2af6c4d851a4f97ec3e471b55
Calvin On [Fri, 10 Nov 2017 19:19:59 +0000 (11:19 -0800)]
Fix NPE for devices without StatusBar implementation.
Bug:
68949061
Change-Id: I025ea812b7fed79c4c22b1c68b4fe3ea17300be1
TreeHugger Robot [Fri, 10 Nov 2017 19:14:43 +0000 (19:14 +0000)]
Merge "Remove unnecessary parameter WriteStringToFile"
yro [Fri, 10 Nov 2017 04:36:25 +0000 (20:36 -0800)]
1. Add FIELD_COUNT_REPEATED bit masks to repeated fields that were previously missing
2. Resolve segfault when serializing proto into vector of uint8_t
3. Add a local byte size variable for EventMetric data as we cannot call
size() of ProtoOutputStream before we finish writing.
4. Replace hardcoded conversion of second to nano second with NS_PER_SEC
Test: statsd, statsd_test
Change-Id: I47a2ce2b05e6191c18596489682118edcb41e945
Beverly [Wed, 8 Nov 2017 23:14:59 +0000 (18:14 -0500)]
DND behavior system sounds cannot bypass DND
If media & system feedback is not allowed to bypass DND
(set in Do Not Disturb Behavior Settings), then touch sounds
and lock screen sounds cannot play sounds.
Bug:
69062790
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: Ic599f61d73d06d0616e5a247c537ff35487b5449
Jakub Pawlowski [Mon, 6 Nov 2017 20:17:30 +0000 (12:17 -0800)]
Move connectSocket into IBluetoothSocketManager (3/3)
Bug:
68359837
Test: none
Change-Id: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Adam Lesinski [Fri, 10 Nov 2017 19:00:10 +0000 (19:00 +0000)]
Merge "Check for null-terminator in ResStringPool::string8At"
Victor Hsieh [Thu, 9 Nov 2017 18:32:10 +0000 (10:32 -0800)]
Change pm.dexopt.priv-apps to .priv-apps-oob
Other than the renaming, the meaning is now opposite.
(cherry-picked from aosp/533101)
Test: build
Bug:
67415855
Bug:
63920015
Change-Id: I349c0b233079b5958e4a308d6c7ad9b3a54f157a
(cherry picked from commit
66a285d9d7afe197a5a562525641400db80edcef)
Greg Daniel [Fri, 10 Nov 2017 18:38:50 +0000 (18:38 +0000)]
Merge "Initialize pointer members in VulkanManager to null"
TreeHugger Robot [Fri, 10 Nov 2017 18:32:57 +0000 (18:32 +0000)]
Merge "Make SimpleCondition satisfactorily complicated."
TreeHugger Robot [Fri, 10 Nov 2017 18:31:11 +0000 (18:31 +0000)]
Merge "Fixes rotating tablet changing original dock side in landscape"
Evan Rosky [Fri, 10 Nov 2017 18:23:45 +0000 (18:23 +0000)]
Merge "Fix more coretests in light of no-initial-focus"
Evan Rosky [Fri, 10 Nov 2017 18:20:06 +0000 (18:20 +0000)]
Merge "Revert "Enable new initial-focus behavior for P""
Evan Rosky [Thu, 9 Nov 2017 19:25:24 +0000 (19:25 +0000)]
Revert "Enable new initial-focus behavior for P"
This reverts commit
4dc3289c942398507a8b6240559da599d11a3284.
Reason for revert: Pushback from bundled apps.
Bug:
68841055
Bug:
34520588
Change-Id: Id771a11c9b44baf5810240cca164bae9f468b5ad
Adam Lesinski [Fri, 10 Nov 2017 18:05:54 +0000 (18:05 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev am:
07d8249c4b
am:
cc8aa11f6c -s ours
Change-Id: If6a18f0d0807b558a2329ede06393eb18814a85d
Winson Chung [Fri, 10 Nov 2017 18:00:28 +0000 (10:00 -0800)]
Consider only the top most stacks for visibility test
Bug:
69121908
Test: Open app in recents, then go home and open another app, turn screen
off and ensure the device does not start the home activity.
Change-Id: I814cf177247b7fbba79dbd9ec2600f30dee23054
John Reck [Fri, 10 Nov 2017 17:56:38 +0000 (17:56 +0000)]
Merge "Allow hwuimacro to choose a renderer"
Jon Dormody [Fri, 10 Nov 2017 17:52:29 +0000 (17:52 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3 am:
719e8b5412 am:
430ed07596
am:
24f9ac4ecf
Change-Id: I3e193dd4898637a08eb771419dfbb1c14a610b77
Adam Lesinski [Fri, 10 Nov 2017 17:50:49 +0000 (17:50 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev
am:
07d8249c4b
Change-Id: I0a3235052cea9041cf6c944f71879d304bce5a56
Jon Dormody [Fri, 10 Nov 2017 17:39:42 +0000 (17:39 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3 am:
719e8b5412
am:
430ed07596
Change-Id: I672d6c2ff08bbe91c12bfacbe3b493ca17613ce1
Adam Lesinski [Fri, 10 Nov 2017 17:32:52 +0000 (17:32 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev
Wei Wang [Fri, 10 Nov 2017 05:45:29 +0000 (21:45 -0800)]
Remove unnecessary parameter WriteStringToFile
By default, WriteStringToFile will not follow link, the 'false'
parameter is unnecessary.
Test: build
Change-Id: Ied6dcbf2a85533108dc2f6d71a4571b44684e800