OSDN Git Service
Winson Chung [Thu, 15 Jun 2017 21:51:52 +0000 (21:51 +0000)]
Merge "Update TV to show custom actions." into oc-dev
am:
1a01d1298f
Change-Id: I841d27de83656a1f8b3bf279401217348569fea7
Eugene Susla [Thu, 15 Jun 2017 21:48:47 +0000 (21:48 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
am:
7a4cf16ce9
Change-Id: Iad09afd86c9e6b3692654083743d5014b978cac8
Eino-Ville Talvala [Thu, 15 Jun 2017 21:10:51 +0000 (21:10 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am:
20c2116c1f
Change-Id: I82b234f1fa7ea6b231bacdd99543b68fa8be51c6
Winson Chung [Thu, 15 Jun 2017 21:05:44 +0000 (21:05 +0000)]
Merge "Update TV to show custom actions." into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 20:57:16 +0000 (20:57 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 20:56:38 +0000 (20:56 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
Ying Xu [Thu, 15 Jun 2017 19:48:07 +0000 (19:48 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master
am:
fa67fe7a4e
Change-Id: I62d094ce16e65bf613e5e4b9405c87726e175c8f
Ying Xu [Thu, 15 Jun 2017 19:44:45 +0000 (19:44 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2
am:
c4f797652c
Change-Id: If7d2093b6ff24bffeeb75a6eb0e91d047b872dad
TreeHugger Robot [Thu, 15 Jun 2017 19:42:47 +0000 (19:42 +0000)]
Merge "resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp
Sudheer Shanka [Thu, 15 Jun 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
am:
2ca51820f0
Change-Id: I863f048dd4b95c0f9278fe8aefc432f852b82eae
Sudheer Shanka [Thu, 15 Jun 2017 19:25:02 +0000 (19:25 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
Dianne Hackborn [Thu, 15 Jun 2017 18:52:07 +0000 (18:52 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
ef0554438f
Change-Id: I39ad3ffce83c1817bdc8aa7ab9f623d1b683d983
Dianne Hackborn [Thu, 15 Jun 2017 18:45:28 +0000 (18:45 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
Eugene Susla [Thu, 15 Jun 2017 18:22:57 +0000 (11:22 -0700)]
Fix companion uses-permission enforcement
Fixes: b/
62662686
Test: Call CompanionDeviceManager#associate from app without uses-permission
declaration
Ensure exception is thrown
Call the method from app with the declaration
Ensure no exception is thrown
In debug mode catch the #isCallerSystem call from NotificationManagerService
(which runs in the system process) and ensure it passes the check
Change-Id: I26e5d2a7f5e63a346d4ab50b9ded1ec7dbc246a5
Jason Monk [Thu, 15 Jun 2017 17:41:14 +0000 (13:41 -0400)]
resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If41b96601018976c8f5a5ea8d124bc0abb4ef605
Android Build Merger (Role) [Thu, 15 Jun 2017 17:07:11 +0000 (17:07 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master
Ying Xu [Thu, 15 Jun 2017 17:06:03 +0000 (17:06 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
am:
3890689bb2
Change-Id: I6b295dfe38e8c75ab6dd3add2521d63b62f4c8f1
Ying Xu [Thu, 15 Jun 2017 16:59:59 +0000 (16:59 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
am:
3890689bb2
Change-Id: I07e33a09f7ed2af457d2ad6261b5469b9dfd15c2
Ying Xu [Thu, 15 Jun 2017 16:50:09 +0000 (16:50 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
Chris Wren [Thu, 15 Jun 2017 16:28:27 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: Ic53f15be9f13034e72fa056308e75fa0f4f310b0
TreeHugger Robot [Thu, 15 Jun 2017 16:20:07 +0000 (16:20 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
Jason Monk [Thu, 15 Jun 2017 15:32:26 +0000 (15:32 +0000)]
Merge "NfcTile: make sure NFC adapter is always available when needed"
am:
13ade8f910
Change-Id: I731c4d0f3460d1b2a24232a87afcd5c327ecb4b0
Jason Monk [Thu, 15 Jun 2017 15:21:36 +0000 (15:21 +0000)]
Merge "NfcTile: make sure NFC adapter is always available when needed"
Anas Karbila [Thu, 15 Jun 2017 13:36:53 +0000 (22:36 +0900)]
NfcTile: make sure NFC adapter is always available when needed
Test: enable NFC->reboot->directly open QS panel, NFC tile will show disabled state. This commit fixes it.
Change-Id: Iabbe4ec11a38614b9c65627d58c6ee9ec93435f3
Eino-Ville Talvala [Tue, 13 Jun 2017 19:43:19 +0000 (12:43 -0700)]
ImageReader: Set BufferItem mGraphicBuffer to null when returning it
The ImageReader JNI layer needs to maintain a list of BufferItems that
back the Java Image objects. At start, we allocate maxImages of these
in a list, and acquire and release them from this list as the
application acquires and releases Images.
However, on release, the contents of the BufferItem are not adjusted,
so it can retain a reference to a GraphicBuffer until the BufferItem
is reused.
Test: Camera CTS passes, memory usage drops after camera bursts
Bug:
62652080
Change-Id: I9aade5e32cbe0af0c15a3886e16ada1a70392b74
Chris Wren [Wed, 14 Jun 2017 19:59:03 +0000 (15:59 -0400)]
add a log for peek to shade expansion
Move the note_load counter into the manager, replacing
the redundant and useless notification_load counter.
Update the StatusBarTest to allow for hander side-effects.
Test: runtest systemui
Change-Id: I2551c51cc0f4627995abe4401eafc2e5adb3a8fa
Fixes:
27698560
Paul Duffin [Tue, 13 Jun 2017 14:53:11 +0000 (15:53 +0100)]
Fix dependencies of packages that target earlier releases
A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.
This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* packages/SettingsProvider/test/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SettingsProviderTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
SettingsProviderTest uses classes from package android.test
(possible indirectly) and needs them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
* services/tests/servicestests/Android.mk
Replaced 'android.test.runner' with 'android.test.mock' and
'legacy-android-test' in LOCAL_JAVA_LIBRARIES because module
FrameworksServicesTests uses classes from packages android.test and
android.test.mock (possible indirectly) and needs them available at
compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
They were not added to LOCAL_STATIC_JAVA_LIBRARIES because
FrameworksServicesTests's manifest file (AndroidManifest.xml)
targets API level 26 and uses the android.test.runner library which
will provide the classes dynamically at runtime.
Dependency 'android.test.mock.sdk' is used instead of
'android.test.mock' because module FrameworksServicesTests builds
against internal jars not the API and so should use libraries that
build against internal jars not the API.
* tests/AppLaunch/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppLaunch uses classes from
package android.test (possible indirectly) and needs them available
at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppLaunch's manifest file (AndroidManifest.xml) targets API
level 24 and dynamically includes the android.test.runner library
at runtime so there is no point in statically including the
classes.
* tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module SmartCamera-tests uses classes
from package android.test (possible indirectly) and needs them
available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SmartCamera-tests's manifest file (AndroidManifest.xml)
targets API level 17 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
* tests/Compatibility/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppCompatibilityTest uses
classes from package android.test (possible indirectly) and needs
them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppCompatibilityTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Bug:
30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I3d183a96bf87437028a2d4b774d311e40349f4d0
Jorim Jaggi [Thu, 15 Jun 2017 06:30:15 +0000 (06:30 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
am:
0823c9ff5c
Change-Id: Idb18d226c2d7d427fcbb61ff2218d5fd034cb63e
TreeHugger Robot [Thu, 15 Jun 2017 06:24:30 +0000 (06:24 +0000)]
Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
Jorim Jaggi [Thu, 15 Jun 2017 06:18:48 +0000 (06:18 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
am:
7831f0c436
Change-Id: Ie09778df49eaa937b96a38f9c07d27bf87dbfdcf
Jorim Jaggi [Thu, 15 Jun 2017 06:11:10 +0000 (06:11 +0000)]
Merge "Actually do not hold WM lock while closing transaction" into oc-dev
Sundeep Ghuman [Thu, 15 Jun 2017 05:23:48 +0000 (05:23 +0000)]
Merge "Create a staleScanResults bit." into oc-dev
am:
d1094717a1
Change-Id: Iab2e12d6c307dd57f14ff4830a5827d3c687fa04
TreeHugger Robot [Thu, 15 Jun 2017 05:19:46 +0000 (05:19 +0000)]
Merge "Create a staleScanResults bit." into oc-dev
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:12:45 +0000 (05:12 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
am:
cbf19dcd76
Change-Id: If78cc6a4c6a0677e872a99aab9a607022b9008ad
Gopinath Elanchezhian [Thu, 15 Jun 2017 05:05:21 +0000 (05:05 +0000)]
Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev
Jorim Jaggi [Wed, 14 Jun 2017 23:04:59 +0000 (16:04 -0700)]
Remove snapshot when screen gets rotated in mean time
We also need to wait for windows that are not gone for layout, as
otherwise we'd unfreeze before the surface is actually created.
Test: go/wm-smoke
Test: Open Camera in landscape but home screen locked to portrait
Change-Id: I0fc7a016445e18af1eead292665702b768b4e95b
Fixes:
38261533
Jorim Jaggi [Thu, 15 Jun 2017 04:25:04 +0000 (04:25 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
am:
04c3cc6d12
Change-Id: I9d9afbb3161bd5abfa9d4fe2a98e00b643b602ea
Jorim Jaggi [Thu, 15 Jun 2017 04:19:48 +0000 (04:19 +0000)]
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
Lei Yu [Thu, 15 Jun 2017 02:12:28 +0000 (02:12 +0000)]
Merge "Revert the time zone display name logic" into oc-dev
am:
d9b1697b2d
Change-Id: I9f28c603a44290c49121bd06694a84dab73747be
Lei Yu [Thu, 15 Jun 2017 02:04:39 +0000 (02:04 +0000)]
Merge "Revert the time zone display name logic" into oc-dev
Jorim Jaggi [Thu, 15 Jun 2017 01:09:58 +0000 (18:09 -0700)]
Actually do not hold WM lock while closing transaction
Test: go/wm-smoke
Test: Quick switch 100x, observe no delay
Change-Id: I46022a23f749c52ba7f46e105679d728277970bd
Fixes:
62444483
Jorim Jaggi [Tue, 13 Jun 2017 18:54:04 +0000 (11:54 -0700)]
Use splashscreen if we can't fill horizontaly with snapshot
A gap at the right side of the snapshot looks pretty bad. Thus,
we use a splash screen in case there would be a gap on the right
side. However, we don't want to do this from recents as we'd
produce another flicker
Test: go/wm-smoke
Test: Open app portrait, go launcher, rotate, open app landscape
Test: Open app landscape, go launcher rotate, open app portrait
Fixes:
62094756
Change-Id: Iaf1fecced822685187477a4698fa6b67c6e485d7
Rob Carr [Thu, 15 Jun 2017 01:25:26 +0000 (01:25 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
am:
03e61aa9bb
Change-Id: I6c53bff8ecc906658a3f8e81acfb6cb2e241121a
Rob Carr [Thu, 15 Jun 2017 01:18:17 +0000 (01:18 +0000)]
Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
Dianne Hackborn [Thu, 15 Jun 2017 00:30:15 +0000 (17:30 -0700)]
Work on issue #
36891897: Need to ensure foreground services...
...can't hide themselves
Tune the policies for when we tell about apps running in the
background after their services have stopped.
- If it ran while the screen was on, the time we require for it
to be running is much shorter (a couple seconds) as well as the
time we tell about it having run (with another tunable for the
minimum time we tell about this).
- If it has only run while the screen is off and stops a sufficient
amount of time before the screen goes on (currently a second) then
we will not show anything when the screen goes on.
- If it stops when the screen turns on, we will make sure the user
sees about it for a short period of time (currently 5 seconds).
Also includes some improved debug output about handler message
queues.
Test: manual
Change-Id: Iab438410d7182b2dfe4f9c1cce7069b26b34834c
Evan Laird [Wed, 14 Jun 2017 22:19:13 +0000 (22:19 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev
am:
38778637ad
Change-Id: I8c25a0442ec55f2c6b79df0e6c47b436a9410267
TreeHugger Robot [Wed, 14 Jun 2017 22:10:51 +0000 (22:10 +0000)]
Merge "Fix null drawable for Mobile signal data edit QS tile" into oc-dev
Sundeep Ghuman [Thu, 8 Jun 2017 01:11:39 +0000 (18:11 -0700)]
Create a staleScanResults bit.
This bit is set to true during stop tracking and will not change until
fresh scan results come in. This bit is used to prevent
onAccessPointsChanged callbacks from being invoked until other new scan
results are processed.
This is necessary to fix a UI issue in WifiSettings during app
resumption where sticky broadcasts from other intents come in before
a new scan result is available, causing us to clear out all shown APs
since the ScanResults are stale and thus removed from the picker.
Bug: b/
38212080
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I2f1fd84d1ab3461d9c8eac9511b90ba7533879c1
Robert Carr [Tue, 13 Jun 2017 19:41:53 +0000 (12:41 -0700)]
Correct errant entry in to DRAG_RESIZE_FREEFORM state.
Observing the logic in computeDragResizing(), we see that whenever an
AppWindowToken has frozen bounds we will enter the drag resizing
state. Furthermore, in setDragResizing() we see that if the docked
divider is not resizing, then we set ourselves as freeform
resizing. Also observe that AppWindowToken#startRelaunching
unconditionally freezes the bounds for tasks not in the freeform
stack. This means we are almost always entering the freeform resize
state while relaunching. Within computeDragResizing, the StackId check
and the MATCH_PARENT check have prevented this from being an issue in
too many places, espescially in pinned.
Once we are in this state, calculateSurfaceBounds() will force us to
0,0 as it thinks we are using the big surface approach.
There's no need to freeze the bounds if we weren't drag resizing at
the time that the app is relaunched, and this CL enforces that.
Bug:
62430780
Test: Manual repro from bug. To verify no regressions, create app with long delay in onResume (>1s) verify no flickers when releasing the docked divider and triggering a resize.
go/wm-smoke
Change-Id: I1d9bdfbe815ff48c884f933acd65612429d633ef
John Reck [Wed, 14 Jun 2017 20:25:03 +0000 (20:25 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
am:
31443a17e8
Change-Id: Ic63e4f48ec55bce9f51089bc41481ab8805ae8c7
Daniel Sandler [Wed, 14 Jun 2017 20:18:56 +0000 (20:18 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
am:
0e6a5f8d7e
Change-Id: I7e00e745c8aa2ddb6232747d4371dc3194be28ef
TreeHugger Robot [Wed, 14 Jun 2017 20:13:59 +0000 (20:13 +0000)]
Merge "Add a workaround for simulate secondary display" into oc-dev
Daniel Sandler [Wed, 14 Jun 2017 20:12:32 +0000 (20:12 +0000)]
Merge "Revert accidental API change to RemoteViews." into oc-dev
Daniel Sandler [Tue, 13 Jun 2017 18:32:46 +0000 (18:32 +0000)]
Revert accidental API change to RemoteViews.
This reverts commit
7f09ce1a238ad5a647da913e275fd637ac75ab49 (but
retains the bug fix)
Change-Id: Ib4700ada5aa0b5dab7e43f895b48eb7058308869
Fixes:
62543637
Bug:
62181033
Evan Laird [Wed, 14 Jun 2017 19:40:02 +0000 (15:40 -0400)]
Fix null drawable for Mobile signal data edit QS tile
Currently it's a funky situation with CellTileView. There should
ultimate be a better way to handle displaying the SignalDrawable (per
the TODO comments), but this is a sensible fix to show the mobile data
icon in the edit QS screen for now.
Test: visual
Bug:
62525439
Change-Id: I95f0fb86862aa6a7b60f304053a73127907943ee
yinxu [Wed, 14 Jun 2017 17:31:40 +0000 (10:31 -0700)]
Use java.util.Objects.hashCode to get hashcode.
Test: Telephony sanity tests
Change-Id: I8b845f2e5e44b242278b8955807d1b40e67e1414
John Reck [Wed, 14 Jun 2017 17:47:50 +0000 (10:47 -0700)]
Add a workaround for simulate secondary display
To workaround a deadlock caused by bufferqueue locks
we force RenderThread over to use async mode which
we enable via eglSwapInterval(0)
Bug:
38372997
Test: steps in the bug
Change-Id: Ia305f73abbdd64ab0c25d1f7d32792cc6295a0ce
Andrei Stingaceanu [Wed, 14 Jun 2017 17:46:59 +0000 (17:46 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev
am:
511c95a022
Change-Id: I57eafe97328ee10bd0ccee296586307baa02cc6d
TreeHugger Robot [Wed, 14 Jun 2017 17:38:42 +0000 (17:38 +0000)]
Merge "DayPickerView - clamp date to min/max" into oc-dev
jackqdyulei [Mon, 12 Jun 2017 20:58:26 +0000 (13:58 -0700)]
Revert the time zone display name logic
This cl is a partial revert of ag/
1490275, and only
reverts the method getTimeZoneOffsetAndName. Reverting
it because it fails the PTCRB test.
After this revert, it will consistently show the zone
long name in Date & time page (which is the behaviour
in N).
Bug:
62077986
Test: SettingsLibTests
Change-Id: I8174bd7a3de09e476bbffefa6e71d997340dc7d8
Philip P. Moltmann [Wed, 14 Jun 2017 14:52:13 +0000 (14:52 +0000)]
Merge "Select the right pages to scrap" into oc-dev
am:
890cb59003
Change-Id: I5393dde07ea3feff2053d85769eccd5195139229
Philip P. Moltmann [Wed, 14 Jun 2017 14:44:30 +0000 (14:44 +0000)]
Merge "Select the right pages to scrap" into oc-dev
Jason Monk [Wed, 14 Jun 2017 13:46:17 +0000 (13:46 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
am:
2a0b423cd4
Change-Id: Ic8ce2331b9191422f921834f484492bc7bff4c95
Jason Monk [Wed, 14 Jun 2017 13:37:28 +0000 (13:37 +0000)]
Merge "Fix footer not being hidden in detail panels" into oc-dev
Erik Kline [Wed, 14 Jun 2017 10:25:33 +0000 (10:25 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine" am:
6f029bbc82
am:
35728f01cb
Change-Id: I5eb3c02331aabc033ecfebee2900477c61e1b6f6
Erik Kline [Wed, 14 Jun 2017 10:19:35 +0000 (10:19 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
am:
6f029bbc82
Change-Id: I098bd78d29cf4119208d24977dab8494d3bf5fdb
Treehugger Robot [Wed, 14 Jun 2017 10:11:58 +0000 (10:11 +0000)]
Merge "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine"
Peng Xu [Wed, 14 Jun 2017 06:20:15 +0000 (06:20 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
am:
d27d5d9ea8
Change-Id: Iecea6df9119b4a9bbd5843e78787d581ced518c7
Peng Xu [Wed, 14 Jun 2017 06:12:37 +0000 (06:12 +0000)]
Merge "SensorManager: attach background thread to JavaVM" into oc-dev
gopinath [Wed, 14 Jun 2017 04:39:30 +0000 (04:39 +0000)]
App launch test apk change
am:
0a2c9396a2
Change-Id: I2468cfc8f0db8c993ed0203d12bffb5abcd76305
gopinath [Fri, 2 Jun 2017 00:28:36 +0000 (17:28 -0700)]
Use TotalTime instead of ThisTime in app launch test
Bug:
62272543
Test: Tested with calculator and facebook messenger launch
Change-Id: Ide4e844e54428edcb7e3356cb3d0492392f6bde3
(cherry picked from commit
fb9272c637f4b657d40057145e4dbce989005e67)
Ying Xu [Wed, 14 Jun 2017 02:33:41 +0000 (02:33 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" am:
70373f7928
am:
707dc81da1
Change-Id: I37113bddb18b73dbf10b0dc9067dec9311338e86
Ying Xu [Wed, 14 Jun 2017 02:25:53 +0000 (02:25 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
am:
70373f7928
Change-Id: I1c169772fb1335df4128b186e826f1bed1ca501d
Ying Xu [Wed, 14 Jun 2017 02:16:51 +0000 (02:16 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels"
Yifan Hong [Wed, 14 Jun 2017 01:20:09 +0000 (18:20 -0700)]
SensorManager: attach background thread to JavaVM
Test: pass
Bug:
62404135
Change-Id: Ic3c0849cd366f550cbdccbb9bb8d082c5c570c35
Eugene Susla [Wed, 14 Jun 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
am:
c041c7a34e
Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e
gopinath [Fri, 12 May 2017 22:37:37 +0000 (15:37 -0700)]
App launch test apk change
Support launching the app using the package name.
Remove the unused variables.
b/
33226470
Change-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314
(cherry picked from commit
a00259f47dc480f799a812a00f52e3c887aae4b0)
TreeHugger Robot [Wed, 14 Jun 2017 00:03:49 +0000 (00:03 +0000)]
Merge "Support associating with an already-paired device" into oc-dev
Christopher Tate [Tue, 13 Jun 2017 23:39:28 +0000 (23:39 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
am:
796b510787
Change-Id: I0659c68ece4fef6d3e93e436a35c960dc341618b
Adam Lesinski [Tue, 13 Jun 2017 23:30:22 +0000 (23:30 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
am:
9274d87a0e
Change-Id: I559890874c83627283a891f7eb6c4fd46430f618
TreeHugger Robot [Tue, 13 Jun 2017 23:27:10 +0000 (23:27 +0000)]
Merge "Fix #
62545908 : 'metered' network jobs run without network" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 23:16:58 +0000 (23:16 +0000)]
Merge "Use UiContext with StrictMode Dialog" into oc-dev
Winson Chung [Tue, 13 Jun 2017 22:53:09 +0000 (22:53 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
am:
167f0001b8
Change-Id: I4f54c90c54fd81bd399a0198d48ab597feaba217
TreeHugger Robot [Tue, 13 Jun 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Boost the anim thread priority when doing a bounds animation." into oc-dev
Todd Kennedy [Tue, 13 Jun 2017 22:39:56 +0000 (22:39 +0000)]
Merge "Save overlay paths as user state" into oc-dev
am:
508a5bade6
Change-Id: Icba76fbeef9f4cd2a067fafd65c750f1f95a4ed0
TreeHugger Robot [Tue, 13 Jun 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Save overlay paths as user state" into oc-dev
Philip P. Moltmann [Tue, 13 Jun 2017 22:29:01 +0000 (15:29 -0700)]
Select the right pages to scrap
The code before overwrote some data the outside code expected to not be
modified which resulted in the scrapped pages to be offset.
Test: - cts-tradefed run cts-dev -m Print
- Tried to repro case in the bug
Bug:
62296301
Change-Id: If3f250dbca43125bbbe9faadc5183a6dbaa69481
Yang Ni [Tue, 13 Jun 2017 22:18:51 +0000 (22:18 +0000)]
Merge "Do not CloseGuard KernelID or FieldID" am:
6b70eafae1
am:
d25acf1022
Change-Id: I900b48f94fdbdd1f502de36e3f121f472ea1daf8
Yang Ni [Tue, 13 Jun 2017 22:08:06 +0000 (22:08 +0000)]
Merge "Do not CloseGuard KernelID or FieldID"
am:
6b70eafae1
Change-Id: I89390175e3404489991e599a74034e559a527435
Dianne Hackborn [Tue, 13 Jun 2017 21:59:47 +0000 (21:59 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
69c3a1d45a
Change-Id: I71017d8fd6efee24d437f66b2c5be34068bd3dfc
TreeHugger Robot [Tue, 13 Jun 2017 21:51:46 +0000 (21:51 +0000)]
Merge "Fix issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
Treehugger Robot [Tue, 13 Jun 2017 21:49:46 +0000 (21:49 +0000)]
Merge "Do not CloseGuard KernelID or FieldID"
Christopher Tate [Tue, 13 Jun 2017 21:47:20 +0000 (21:47 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am:
630a49aa4e
Change-Id: I2fc48a0117c021ed415ecb06efffb2e41ce567a1
Jason Monk [Tue, 13 Jun 2017 21:44:03 +0000 (21:44 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
am:
02d5b79cf6
Change-Id: I9a1dbc2f382562fb8ced63fd70f1a5e1674285f0
TreeHugger Robot [Tue, 13 Jun 2017 21:36:45 +0000 (21:36 +0000)]
Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
TreeHugger Robot [Tue, 13 Jun 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Fix sysui depending on slow bt calls" into oc-dev
Chad Brubaker [Tue, 13 Jun 2017 21:29:45 +0000 (21:29 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
am:
4a0ea3e88f
Change-Id: Id7b7326f819c9e0389c3ad9db2863e72ec716f83
Chad Brubaker [Tue, 13 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev
Adam Lesinski [Tue, 13 Jun 2017 21:15:19 +0000 (14:15 -0700)]
Use UiContext with StrictMode Dialog
Bug:
62382723
Test: manual
Change-Id: I5cb5ac5de0800b31d0dad7698f9229873ff83e27
Jason Monk [Tue, 13 Jun 2017 17:47:54 +0000 (13:47 -0400)]
Fix footer not being hidden in detail panels
Was causing incorrect accessibility focus
Test: manual
Change-Id: Id487286eb9fa931b73349b0b0dfe772566c10e6d
Fixes:
62568126