OSDN Git Service
Bill Yi [Fri, 12 May 2017 23:23:59 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ideae955ce1ddea3d17038235c4ed55127d7b7541
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 12 May 2017 22:45:04 +0000 (22:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 22:44:21 +0000 (22:44 +0000)]
Merge "Work on issue #
38242094: Activity manager oom adj computation seems broken" into oc-dev
Suprabh Shukla [Tue, 9 May 2017 01:17:55 +0000 (18:17 -0700)]
Adding AOSP copyrights header
Test: N/A
Change-Id: Iabec646a1f8087480f899c5b4996122a9f4bd13a
TreeHugger Robot [Fri, 12 May 2017 22:25:42 +0000 (22:25 +0000)]
Merge "Updating AppWidgetServiceImplTest as per Mockito changes" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 21:57:13 +0000 (21:57 +0000)]
Merge "Batterystats BLE results counter takes in count" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 21:32:04 +0000 (21:32 +0000)]
Merge "Fixed exceptions during test tearDown" into oc-dev
Sunny Goyal [Fri, 12 May 2017 21:08:57 +0000 (21:08 +0000)]
Merge "Setting Session commited broadcast when an existing apk is enabled for a different user" into oc-dev
Rebecca Silberstein [Fri, 12 May 2017 20:50:35 +0000 (20:50 +0000)]
Merge "SystemUI: add NETWORK_SETTINGS permission" into oc-dev
Bill Yi [Fri, 12 May 2017 20:49:56 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
38120923
Change-Id: I3ebe901771f444c2986b15a52f4d16bd342fac37
TreeHugger Robot [Fri, 12 May 2017 20:48:23 +0000 (20:48 +0000)]
Merge "Merge "Add PID info into ANR crash log header" am:
2fe972c822 am:
5d57502c89 am:
5dbe26f0f1 am:
4ae323995d" into oc-dev
Michael Wachenschwanz [Fri, 12 May 2017 20:47:46 +0000 (20:47 +0000)]
Merge "Fix JobSet getJobsByUser" into oc-dev
Dianne Hackborn [Fri, 12 May 2017 00:25:23 +0000 (17:25 -0700)]
Work on issue #
38242094: Activity manager oom adj computation seems broken
This shouldn't change any behavior, but improve the reason we
report for each process's oom_adj / proc state level. There are
two significant things going on here:
1. We now consider a bump up in proc state to be just as significant
as a change in oom_adj, and accordingly update the reason when this
happens. Given how many proc stats we now have mapped to some of
the single oom_adj levels, this matches your expectation to have the
reason be why it is at that proc state and not just some random
other thing at that level.
2. There is special handling of an app at the top state connecting
to another app, deciding the actual state to apply at the end. This
was not at that point updating the reason, so anything the top app
is connected to would get the top state but myseriously have some other
reason, looking very broken. We now propagate the reason over.
Test: manual
Change-Id: Idecbe206d73e7c4cbd989ef6faf3b1679e06c088
TreeHugger Robot [Fri, 12 May 2017 20:26:51 +0000 (20:26 +0000)]
Merge "Set notification TAG and style in TV PIP notification" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 20:14:03 +0000 (20:14 +0000)]
Merge "Avoid activity leak via Companion callback" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 20:13:10 +0000 (20:13 +0000)]
Merge "Removed deprecated APIs." into oc-dev
TreeHugger Robot [Fri, 12 May 2017 20:06:22 +0000 (20:06 +0000)]
Merge "Update Bitmap#prepareToDraw doc" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 20:00:54 +0000 (20:00 +0000)]
Merge "Do not hold WM lock while closing animation transaction" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:41:47 +0000 (19:41 +0000)]
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:17:58 +0000 (19:17 +0000)]
Merge "Do not notifyNoFullUi if no view is focused" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Remove forward matches before checking for default" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:14:47 +0000 (19:14 +0000)]
Merge "Not specify return val of View#onSaveInstanceState" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:10:18 +0000 (19:10 +0000)]
Merge "Default grant mic, storage, camera to SMS app" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 19:07:35 +0000 (19:07 +0000)]
Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" into oc-dev
Michael Wachenschwanz [Fri, 12 May 2017 18:49:27 +0000 (11:49 -0700)]
Fix JobSet getJobsByUser
Retrieve jobs from SparseArray with index using valueAt rather than get
(which uses keys not indices)
Fixes:
38198221
Test: manual
Change-Id: I636f5e0ef43456619700e27944eb6c2d65021643
Signed-off-by: Michael Wachenschwanz <mwachens@google.com>
TreeHugger Robot [Fri, 12 May 2017 18:38:29 +0000 (18:38 +0000)]
Merge "Fix racy clone" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 18:37:57 +0000 (18:37 +0000)]
Merge "Add Save and Restore of BluetoothOn setting" into oc-dev
Selim Cinek [Fri, 12 May 2017 18:35:18 +0000 (18:35 +0000)]
Merge "Fixing the colorization of legacy media notifications" into oc-dev
Selim Cinek [Fri, 12 May 2017 18:32:52 +0000 (18:32 +0000)]
Merge "Don't flash colors when hinting" into oc-dev
Selim Cinek [Fri, 12 May 2017 18:32:25 +0000 (18:32 +0000)]
Merge "Fixing flakey tests" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 18:16:19 +0000 (18:16 +0000)]
Merge "Don't set keyguard state to showing when service disabled" into oc-dev
Sudheer Shanka [Fri, 12 May 2017 18:02:36 +0000 (18:02 +0000)]
Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev
Stanley Tng [Tue, 2 May 2017 04:27:31 +0000 (21:27 -0700)]
Add Save and Restore of BluetoothOn setting
This change will automatically save the Bluetooth On setting when
the user chooses to backup the phone settings into the cloud. This
setting is restored by the Setup Wizard (SUW) when configuring the
phone and this change will enable or disable the Bluetooth based
on this restored setting.
Bug:
35657817
Test: Manual test with Sailfish
Change-Id: Ie4518593af63f96f8c363f98941ca5260a3ec4bb
(cherry picked from commit
767f05feea67e642a76bd3e2e7633a8f5273f077)
Wale Ogunwale [Fri, 12 May 2017 17:37:16 +0000 (10:37 -0700)]
Fixed exceptions during test tearDown
- Acquire WM lock when tearing down test. Prevent the handler thread
from modifying state at the same time.
- Don't set surface boundaries on window states without a surface
control.
- Avoid exception if process can read screen-edge-insets for Pip.
Change-Id: If4a2438032866eaec84ed79c30c1d716e0f89758
Fixes:
38113905
Test: this is it!
TreeHugger Robot [Fri, 12 May 2017 17:33:06 +0000 (17:33 +0000)]
Merge "More QS theme fixes for contrast" into oc-dev
Felipe Leme [Fri, 12 May 2017 16:52:07 +0000 (09:52 -0700)]
Removed deprecated APIs.
Test: CtsAutoFillServiceTestCases pass
Test: manual verification with existing service
Bug:
37563972
Change-Id: Ibea2810f9230f06e59d2d81e4ba853de54987956
Svet Ganov [Mon, 10 Apr 2017 04:24:31 +0000 (21:24 -0700)]
Default grant mic, storage, camera to SMS app
Test: CTS tests updated in same topic
bug:
36713956
Change-Id: I496d8f8dac86594956dcdeb5afafa5b210e28de4
Svetoslav Ganov [Fri, 12 May 2017 17:16:33 +0000 (17:16 +0000)]
Merge "Make sure fd is always initialized" into oc-dev
Sunny Goyal [Thu, 11 May 2017 22:59:19 +0000 (15:59 -0700)]
Setting Session commited broadcast when an existing apk is enabled for
a different user
Test: Manual tests and CTS
Bug:
38204385
Change-Id: Ic3bddbc2e6070c11b11f0685077db7737f2b8849
Sunny Goyal [Fri, 12 May 2017 16:23:53 +0000 (09:23 -0700)]
Updating AppWidgetServiceImplTest as per Mockito changes
Bug:
38251013
Test: adb shell am instrument -e class com.android.server.appwidget.AppWidgetServiceImplTest \
-w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I847335e1c5f9b720b2eecbac1b89b95d9b695e47
TreeHugger Robot [Fri, 12 May 2017 16:23:42 +0000 (16:23 +0000)]
Merge "Remove lots of log spew" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 16:17:55 +0000 (16:17 +0000)]
Merge "Prevent premature display of starting window." into oc-dev
Philip P. Moltmann [Fri, 12 May 2017 16:03:59 +0000 (16:03 +0000)]
Merge "Safeguard against uncommon scenarios when pruning" into oc-dev
Bookatz [Thu, 11 May 2017 19:21:19 +0000 (12:21 -0700)]
Batterystats BLE results counter takes in count
There would likely be too many BLE scan result calls for batterystats to
be healthy. Therefore, the caller can supply a count by which to increase the
counter, instead of doing it one result at a time.
Bug:
37720787
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: Ib8b2e8d250036be24c6c3dac477bc8d34fe498a6
Rebecca Silberstein [Mon, 8 May 2017 18:11:50 +0000 (11:11 -0700)]
SystemUI: add NETWORK_SETTINGS permission
Add the NETWORK_SETTINGS permission to the sysui components so we can
properly check for allowed callers in WifiService.
Bug:
36760523
Test: make
Change-Id: Ia054ffad7a9508e0d80f7b3a444691373ad1924f
Todd Kennedy [Thu, 11 May 2017 20:31:04 +0000 (13:31 -0700)]
Remove lots of log spew
Change-Id: Ia8dbc32c72585c14f9e1a2c5364ab2663bbf97ea
Fixes:
33351736
Test: Manual; start the system and enjoy how little PackageManager spams
TreeHugger Robot [Fri, 12 May 2017 14:25:01 +0000 (14:25 +0000)]
Merge "Re-Re-enable SettingsBackupTest" into oc-dev
Wale Ogunwale [Fri, 12 May 2017 14:17:36 +0000 (07:17 -0700)]
Prevent premature display of starting window.
- When starting an activity, don't tell window manager to make the
windows visible is the keygaurd visibility for the activity is false.
Instead let the activity windows be made visible once the keygaurd
visibility transitions to true.
- Don't send duplicate visibility change request to window manger if we
are not changing state.
Fixes:
34545029
Test: Open a hangouts notification message on the lock-screen
and make sure the starting window doesn't flash.
Change-Id: I745e985766a1af97203e1d22b6443dabdd0c0363
Jason Monk [Tue, 9 May 2017 17:50:47 +0000 (13:50 -0400)]
More QS theme fixes for contrast
Test: visual
Merged-In: I4494e92ebf79bbc20c30a18f5ac13228801a3e54
Change-Id: Ifb03403042561ec23e67159eb51387a460d4f90b
Fixes:
37443237
Julia Reynolds [Fri, 12 May 2017 12:14:07 +0000 (12:14 +0000)]
Merge "Show misc channel with pre-upgrade fields" into oc-dev
Jorim Jaggi [Thu, 11 May 2017 14:27:06 +0000 (16:27 +0200)]
Do not hold WM lock while closing animation transaction
Animation transactions can be blocking, leading to total
window manager starvation. Fix this by not holding lock.
Test: Double tap recents button, make sure it's always responsive
Change-Id: I8e09e04f243d2bfc09fb68097846a42e76c7cab5
Fixes:
38192114
TreeHugger Robot [Fri, 12 May 2017 11:54:32 +0000 (11:54 +0000)]
Merge "TRON: Count smart selection events." into oc-dev
TreeHugger Robot [Fri, 12 May 2017 11:21:30 +0000 (11:21 +0000)]
Merge "Disable font test temporarily" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 11:02:27 +0000 (11:02 +0000)]
Merge "Fix all issues with SystemUI visibility and transitions" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 04:40:21 +0000 (04:40 +0000)]
Merge changes from topic 'onarevert' into oc-dev
* changes:
Create a NotificationChannel for ONA.
Revert "Delete old WifiNotificationController strings."
Doris Liu [Thu, 11 May 2017 23:50:53 +0000 (16:50 -0700)]
Fix racy clone
BUG:
38184803
Test: cts AnimatorSet tests
Change-Id: I308ae9cc014f13a6aa928d8d82e339f476f4b3de
Sudheer Shanka [Wed, 10 May 2017 01:26:18 +0000 (18:26 -0700)]
Add time spent by uid per cpu frequency to batterystats.
Currently we have total user and system cpu time spent by the uid
in the batterystats. This change will add times spent by the uid
at each different cpu frequency to the batterystats dump which will
help in better understanding the battery usage.
Bug:
34133340
Test: manual
Change-Id: I567dc75875eb58543c0e71572d0b440e87dbb4b9
TreeHugger Robot [Fri, 12 May 2017 03:47:17 +0000 (03:47 +0000)]
Merge "Allow Recents to rotate freely." into oc-dev
TreeHugger Robot [Fri, 12 May 2017 03:46:54 +0000 (03:46 +0000)]
Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 02:31:14 +0000 (02:31 +0000)]
Merge "Reduce impact of RenderThread in system_server" into oc-dev
Chris Wren [Fri, 12 May 2017 01:49:01 +0000 (01:49 +0000)]
Merge changes from topic 'b/
36021111' into oc-dev
* changes:
add a global control for badging
extend TestableSettingsProvider to multiuser
TreeHugger Robot [Fri, 12 May 2017 01:40:39 +0000 (01:40 +0000)]
Merge "Fix #
38218977 : NPE restoring widget mappings" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 01:38:11 +0000 (01:38 +0000)]
Merge "Minor tweak, defer building PiP notification until after transition ends" into oc-dev
Eric Laurent [Fri, 12 May 2017 01:35:37 +0000 (01:35 +0000)]
Merge "PhoneWindowManager: allow volume keys in VoIP calls and screen off" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 01:23:12 +0000 (01:23 +0000)]
Merge "Accommodate service disconnect / package update race" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 00:56:10 +0000 (00:56 +0000)]
Merge "OtaDexopt: Ensure float format for progress command" into oc-dev
Jorim Jaggi [Thu, 11 May 2017 21:50:34 +0000 (23:50 +0200)]
Reduce impact of RenderThread in system_server
- Don't try to persist snapshots during window animations. It can
wait and doing it later while decrease the load during window
animations, leading to less jank.
- Lower RT priority to 130 from system_server. It's only used for
background things.
Bug:
37631016
Bug:
36631902
Change-Id: I4fc21b53f257d0194a7f64c3064756ab2426ff17
TreeHugger Robot [Fri, 12 May 2017 00:22:40 +0000 (00:22 +0000)]
Merge "AAPT: Include empty locale in getLocales" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 00:20:42 +0000 (00:20 +0000)]
Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
Jorim Jaggi [Fri, 12 May 2017 00:16:26 +0000 (02:16 +0200)]
Fix all issues with SystemUI visibility and transitions
- Use win.isVisible again to determine top opaque full screen
window. !goneForLayout isn't really correct as windows that are
just about to draw can already influence SystemUI flags
- Don't coalesce messages in CommandQueue. This messes up ordering!
Bad!
Test: Unlock to Settings
Test: Navigate around in settings, make sure no flashes
Test: Cold launch United app
Test: Go to recents <-> settings 10 times
Change-Id: I15d37b35344d955c45591386182c5266bba74f01
Fixes:
37926053
Fixes:
37433095
Fixes:
37923474
TreeHugger Robot [Fri, 12 May 2017 00:15:51 +0000 (00:15 +0000)]
Merge "Make batterystats less chatty" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 00:13:51 +0000 (00:13 +0000)]
Merge "Cleanup API that is already @removed" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 23:59:49 +0000 (23:59 +0000)]
Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev
Selim Cinek [Thu, 11 May 2017 23:56:55 +0000 (16:56 -0700)]
Fixing flakey tests
Sometimes if the system is slow or the process isn't scheduled in time,
our test may take a long time. We still want to test the async
flow, and exclude the flakyness in the rest of the cases, so we
removed the timeout.
Test: runtest systemui
Change-Id: I562d0798d274ca93d9ae0644f44504428d84023c
Fixes:
38184803
Svet Ganov [Thu, 11 May 2017 23:45:15 +0000 (16:45 -0700)]
Make sure fd is always initialized
Test: MemoryIntArray tests pass
bug:
35791084
Change-Id: Icf1ea7717d58a23b89f85a798826b2f5e4d47401
TreeHugger Robot [Thu, 11 May 2017 23:38:19 +0000 (23:38 +0000)]
Merge "Fix app bounds for pinned stack" into oc-dev
Christopher Tate [Sat, 6 May 2017 00:37:43 +0000 (17:37 -0700)]
Accommodate service disconnect / package update race
Ordering of delivery of package monitoring messages and service
disconnect callbacks is indeterminate, but we need to make decisions
about service disconnect based on the package update state. We
address the race by explicitly deferring our reset/timeout logic by
a short time to allow the package monitor to process any pending
updates on the same looper thread before we take action.
Bug
34356215
Test: manual
Change-Id: Icffedbaf19b8eac8830c22fc05f299eb96b54acd
Selim Cinek [Wed, 10 May 2017 23:33:25 +0000 (16:33 -0700)]
Fixing the colorization of legacy media notifications
Previously the colorization wouldn't work if the notification
was not targeting N and above, since for those the
remoteviews would be built into the notification and we couldn't
colorize it.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/MediaNotificationProcessorTest.java
Fixes:
38147364
Fixes:
37743600
Change-Id: Iabad02a4515c42676c0660293e58cf62d5d8ff88
Svet Ganov [Thu, 11 May 2017 21:36:50 +0000 (14:36 -0700)]
System/root/shell need to explicitly ask for static libs to get them
Test: manual - settings no longer shows static shared libs
all shared lib CTS tests pass
bug:
36632271
Change-Id: If3363059b5f5300e309b61899af8c2559af317fe
TreeHugger Robot [Thu, 11 May 2017 22:40:34 +0000 (22:40 +0000)]
Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
Christopher Tate [Thu, 11 May 2017 22:39:34 +0000 (15:39 -0700)]
Fix #
38218977 : NPE restoring widget mappings
Remember that we might not be able to resolve historical
widget provider references, so don't access them unchecked.
Test: manual
Change-Id: I01c6c68461b6d15aa8fee402a4bfb0f21bf1ddbb
TreeHugger Robot [Thu, 11 May 2017 22:37:42 +0000 (22:37 +0000)]
Merge "Decrease default number of partitions from 64 to 10." into oc-dev
Philip P. Moltmann [Thu, 11 May 2017 22:32:15 +0000 (15:32 -0700)]
Not specify return val of View#onSaveInstanceState
.. as the comment was incorrect since a long time.
Bug:
37802299
Test: compiled
Change-Id: I10fe0b1c0f7f4ccaade38c87136a3785f2685798
Evan Rosky [Thu, 11 May 2017 22:26:09 +0000 (22:26 +0000)]
Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
Jorim Jaggi [Thu, 11 May 2017 22:21:06 +0000 (00:21 +0200)]
Don't set keyguard state to showing when service disabled
Test: Create restricted profile, reboot
Change-Id: I7c9b215054e6041ff7fb71cb1aaf0e07ad01039c
Fixes:
37221109
Martijn Coenen [Thu, 11 May 2017 22:07:31 +0000 (22:07 +0000)]
Merge "Only spawn one binder thread for screencap." into oc-dev
Abodunrinwa Toki [Mon, 8 May 2017 15:03:01 +0000 (16:03 +0100)]
TRON: Count smart selection events.
Logs:
- Smart selection occured
- TextView menu item activated on smart selection
- Smart selection reset
- Smart selection modified
Test: Manually checked logging happens as per go/tron-howto and verified
nothing is broken in related classes by running:
bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
32572232
Change-Id: Ia9081d92ae9aea50d863455be770eecd0c73be1a
TreeHugger Robot [Thu, 11 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Fix support for @empty in style resolution" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 21:37:59 +0000 (21:37 +0000)]
Merge "Finish issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
Aurimas Liutikas [Thu, 11 May 2017 21:30:27 +0000 (21:30 +0000)]
Suppress AppCacheTest tests that cause am instrument failure.
These tests runs a command to clear application data and by
doing so causes the application that is being instrumented
to restart, which in turn "am instrument' thinks is an app
crash, thus aborting the rest of the tests.
Bug:
38238448
Change-Id: Ida69b828a9950a83d790a3a7628e32c14a04a772
Test: bit FrameworksCoreTests:android.content.pm.AppCacheTest
Chris Wren [Fri, 5 May 2017 22:05:56 +0000 (18:05 -0400)]
add a global control for badging
Content observer callbacks don't specify the user,
so scan all the users we know about. User switches
will also trigger an update which will explicitly
check the setting for the (now) current user.
Migrate tests to TestableContext to allow the test
to safely override secure settings.
Bug:
36021111
Test: runtest systemui-notification
Change-Id: I588068382912955da114cc351df7a1e7b4f0733f
TreeHugger Robot [Thu, 11 May 2017 21:18:28 +0000 (21:18 +0000)]
Merge "AOD: Fix wakeup animation duration" into oc-dev
Chris Wren [Wed, 10 May 2017 19:08:36 +0000 (15:08 -0400)]
extend TestableSettingsProvider to multiuser
Bug:
36021111
Test: runtest -x frameworks/base/tests/testables
Change-Id: I13dc2b33a39a01954034fa3d69ae9645d23c3304
Youngsang Cho [Thu, 11 May 2017 00:09:10 +0000 (17:09 -0700)]
Set notification TAG and style in TV PIP notification
Bug:
37249867
Change-Id: I32d70f1495f97971aa47a0f3f1c10a4903f8bebe
Eugene Susla [Mon, 24 Apr 2017 23:13:20 +0000 (16:13 -0700)]
Avoid activity leak via Companion callback
Test: invoke associate() API and ensure it still works
Change-Id: I9aedb043b4b1f0d77f076d8753cd60ff7c98a7d6
Julia Reynolds [Thu, 11 May 2017 20:55:23 +0000 (20:55 +0000)]
Merge "Lock relevant fields on channel update" into oc-dev
Jerry Zhang [Thu, 11 May 2017 19:42:58 +0000 (12:42 -0700)]
Only force reset when adb is not enabled (i.e. mtp is)
Some users depended on adbd continuing to run after disconnect
in order to use scripts with nohup. This change allows this
use case to keep working since only mtp has to be force
set.
Bug:
38227228
Test: adb shell "nohup sh /sdcard/script" where script contains
"sleep 5; touch /sdcard/done" and verified file still appears even if
disconnected during sleep.
Test: am force-stop com.android.providers.media, still connects
Change-Id: I25ae2b922fa4d06109ac8cf5e43e1c47a33c46a6
TreeHugger Robot [Thu, 11 May 2017 20:38:23 +0000 (20:38 +0000)]
Merge "Detect isVisibleToUser post layout" into oc-dev
Andreas Gampe [Thu, 11 May 2017 20:36:30 +0000 (13:36 -0700)]
OtaDexopt: Ensure float format for progress command
The progress value will be forwarded to update_engine, which expects
a "."-based float representation. Use Locale.ROOT when printing.
Bug:
37760573
Test: m
Test: adb root && adb shell cmd otadexopt prepare && \
adb shell cmd otadexopt progress | grep 0.00
Test: Switch to German, reboot, \
adb root && adb shell cmd otadexopt prepare && \
adb shell cmd otadexopt progress | grep 0.00
Change-Id: I99ffdd3aefa77d77b73fb7b94accefc0f2eb3c0a
TreeHugger Robot [Thu, 11 May 2017 20:30:55 +0000 (20:30 +0000)]
Merge "Ensure remote calls to a fill service timeout." into oc-dev