OSDN Git Service
Etan Cohen [Wed, 29 Mar 2017 17:32:13 +0000 (17:32 +0000)]
Merge "[AWARE] Fix unit tests" into oc-dev
Rob Carr [Wed, 29 Mar 2017 16:44:36 +0000 (16:44 +0000)]
Merge "SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 15:34:58 +0000 (15:34 +0000)]
Merge "Re-enable throw when notifications posted can't find channel" into oc-dev
Etan Cohen [Tue, 28 Mar 2017 17:31:47 +0000 (10:31 -0700)]
[AWARE] Fix unit tests
Update to reflect new mockito semantics.
No functional change, no change to test semantics!
(cherry-pick of commit
afddcc3c9860fecfdb3ed72fafb09d73e8549411)
Bug:
36680830
Test: unit tests now passing
Merged-In: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
TreeHugger Robot [Wed, 29 Mar 2017 13:26:21 +0000 (13:26 +0000)]
Merge "Add audio service support to BridgeContext" into oc-dev
Geoffrey Pitsch [Wed, 29 Mar 2017 13:19:50 +0000 (09:19 -0400)]
Re-enable throw when notifications posted can't find channel
Only applies for non-user builds, and for apps that have tried using
channels.
Test: runtest systemui-notification
Change-Id: I7e28545ba28eadae75bf015bdf490093223e2940
Diego Perez [Wed, 29 Mar 2017 11:03:58 +0000 (12:03 +0100)]
Add audio service support to BridgeContext
Bug: http://b.android.com/259326
Test: N/A
Change-Id: Ie43ccca49a5e77d82426b4f265e3c05dddfacad9
Tony Mak [Tue, 28 Mar 2017 17:50:01 +0000 (18:50 +0100)]
Introduce AMS.getLastResumedActivityUserId to fix work profile icon issue
Problem:
Work profile status bar icon feeature is relied on two callbacks
1. onForegroundProfileSwitch (AMS.setResumedActivityLocked)
2. appTransitionStarting (WMS)
We assume callback 1 is always called before 2, but it is not the case.
These two callbacks are triggered by two handlers in two different threads,
and hence race condition happens.
Solution:
Not rely on onForegroundProfileSwitch to update mManagedProfileFocused
flag anymore. Query getLastResumedActivityUserId in appTransitionStarting.
Also, make sure mLastResumedActivity is updated before sending message
to WMS in setResumedActivityLocked.
Test: Start a work app, observe that the work icon is shown.
Test: Start a personal app, observe that work icon is gone.
Test: Dock the work app, tap on it (give it focus), observe that work
icon is shown.
Test: Start a work app, switch user, can see the icon is gone. Switch back,
icon is back.
Bug:
34159089
Change-Id: I2cee141d18e8b7d5607b26dd7a2fd5bc9cd0ebb3
TreeHugger Robot [Wed, 29 Mar 2017 04:41:38 +0000 (04:41 +0000)]
Merge "Allow apps to process ProxyFDCallback asynchrnously." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 04:37:07 +0000 (04:37 +0000)]
Merge "Change string connected_via_network_scorer_default." into oc-dev
Jeff Tinker [Wed, 29 Mar 2017 01:10:54 +0000 (01:10 +0000)]
Revert "Make public getFragments() and onGetLayoutInflater() methods"
This reverts commit
599be3d01ed1811ae365085e67a15d082170b583.
This change is being reverted because it broke git_master build.
Change-Id: I54ab9cd3d9e08dcf870f472fda08cc44e57986d0
bug:
34703669
Stephen Chen [Wed, 29 Mar 2017 01:14:17 +0000 (18:14 -0700)]
Change string connected_via_network_scorer_default.
Bug:
36629448
Test: make
Change-Id: I06945a64b54d7e41c542ec36ef45eb7c8cb7bf10
Casey Burkhardt [Wed, 29 Mar 2017 01:05:33 +0000 (01:05 +0000)]
Merge "Ensures Accessibility button always overrides IME switcher" into oc-dev
Conrad Chen [Wed, 29 Mar 2017 00:46:04 +0000 (00:46 +0000)]
Merge "TIF: open transient columns to public" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 00:42:21 +0000 (00:42 +0000)]
Merge "NetworkPolicy gets updated due to CarrierConfigManager updates." into oc-dev
Tianjie Xu [Wed, 29 Mar 2017 00:29:01 +0000 (00:29 +0000)]
Merge "Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18 am:
1cd3a93288 am:
bc0865bc78" into oc-dev
Daichi Hirono [Wed, 8 Feb 2017 07:20:20 +0000 (16:20 +0900)]
Allow apps to process ProxyFDCallback asynchrnously.
Previously callback methods of ProxyFileDescriptorCallback were invoked
on a background thread prepared in the framework. So all methods were
invoked and processed synchronously. This was problem because if it took
time to fetch bytes of one file, operations for other files were also
blocked.
The CL changes ProxyFileDescriptorCallback methods to be invoked on
Handler passed by apps. Now application can prepare a Handler per file
so that one file does not block others.
Bug:
35229514
Test: cts-tradefed run cts -m CtsOsTestCases -t android.os.storage.cts.StorageManagerTest#testOpenProxyFileDescriptor_async
Change-Id: Ibadc4aad4c0373a3da586459a8f775e40288c895
(cherry picked from commit
4f156065c860d916b649e2b464e9405cafc732e9)
TreeHugger Robot [Tue, 28 Mar 2017 23:43:15 +0000 (23:43 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 23:17:58 +0000 (23:17 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev
Casey Burkhardt [Tue, 28 Mar 2017 22:52:12 +0000 (15:52 -0700)]
Ensures Accessibility button always overrides IME switcher
In the case of both the IME switcher and Accessibility button
appearing within NavigationBarView, we want to allow the
accessibility button to always override the appearance of the IME
switcher as our target users will most-often be using
dead-reckoning to interact with the Accessibility button,
requiring consistent appearance, location, and visibility.
Bug:
35267032
Test: Manual
Change-Id: Ib39d2336efe7073f686d94b3f71fc853af3186bb
TreeHugger Robot [Tue, 28 Mar 2017 22:52:56 +0000 (22:52 +0000)]
Merge "Move activity to display on launch" into oc-dev
Ammar Aijazi [Tue, 28 Mar 2017 22:43:22 +0000 (15:43 -0700)]
NetworkPolicy gets updated due to CarrierConfigManager updates.
Bug: b/
34385985
Test: Added unit tests to NetworkPolicyManagerServiceTest
Change-Id: I1d8249081c478e6484c8011d3eab73a53f105fac
Tianjie Xu [Tue, 28 Mar 2017 20:12:14 +0000 (20:12 +0000)]
Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18 am:
1cd3a93288
am:
bc0865bc78
Change-Id: I65bc4945d0701ecc10fd41f827c4566dfea912f9
(cherry picked from commit
ee45a1f3abd50a7451cfd7b6d7e48b778021bac5)
Makoto Onuki [Tue, 28 Mar 2017 22:19:01 +0000 (22:19 +0000)]
Merge "Correctly set thread group to UiThread's thread." into oc-dev
Makoto Onuki [Tue, 28 Mar 2017 22:03:04 +0000 (22:03 +0000)]
Merge "Log a warning if a dispatch on UiThread takes more than" into oc-dev
Makoto Onuki [Tue, 28 Mar 2017 21:12:34 +0000 (14:12 -0700)]
Log a warning if a dispatch on UiThread takes more than
a certain amount of time.
Bug:
34961340
Test: Boot and launch several apps.
Change-Id: I38bd85a1dd9c572242d04f550df4a979f5f3bea5
TreeHugger Robot [Tue, 28 Mar 2017 21:36:34 +0000 (21:36 +0000)]
Merge "Add Configuration param to onMovedToDisplay" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 21:26:43 +0000 (21:26 +0000)]
Merge "Don't allow settings launch when user isn't setup" into oc-dev
Jason Monk [Mon, 27 Mar 2017 15:17:04 +0000 (11:17 -0400)]
Don't allow settings launch when user isn't setup
Test: runtest systemui
Change-Id: Ia0c90f981b9d45e8e3e8c09771d4baa8ab9fabff
Fixes:
31737292
(cherry picked from commit
7d596d522c06e768e7ff511da30cd3ddfa781223)
Jason Monk [Mon, 27 Mar 2017 14:51:34 +0000 (10:51 -0400)]
Update default QS tile order
Test: visual
Change-Id: Ia28b7b074a240465598fc3559cd3bd3c584fcc5d
Fixes:
36402044
(cherry picked from commit
9f05491cc0b937cb6f10444154be424f0bb29001)
Makoto Onuki [Tue, 28 Mar 2017 21:08:40 +0000 (21:08 +0000)]
Merge "Don't do heavy work on UiThread." into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:47:06 +0000 (20:47 +0000)]
Merge "Intercept direct launch of instant app installer" into oc-dev
Makoto Onuki [Tue, 28 Mar 2017 18:25:47 +0000 (11:25 -0700)]
Don't do heavy work on UiThread.
Bug
34961340
Test: manual test
Test: adb shell am instrument -e class com.android.server.NetworkPolicyManagerServiceTest -w com.android.frameworks.servicestests
(except for flakey ones)
Change-Id: I9895b4e8f5f20b680051173995a8410f08a1f4d0
TreeHugger Robot [Tue, 28 Mar 2017 20:46:41 +0000 (20:46 +0000)]
Merge "make MATCH_FACTORY_ONLY @SystemAPI" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:46:18 +0000 (20:46 +0000)]
Merge "Add extra flag to ApplicationInfoFlags" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:45:22 +0000 (20:45 +0000)]
Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS" into oc-dev
Todd Kennedy [Fri, 24 Mar 2017 21:10:01 +0000 (14:10 -0700)]
Intercept direct launch of instant app installer
The instant app installer is not designed to be launched directly
by 3p apps. Instead, intercept the launch and make it look like
a "normal" instant app launch.
cherry-picked from I89c9b8c56865e260a2b92f8c2312a305a74f9cf5
Bug:
33073524
Test: Built and notice poorly behaving apps [*cough* keep *cough*] now launch instant apps
Change-Id: I5401aa8423042f54f1478409065b0d6b25cebe89
Todd Kennedy [Mon, 27 Mar 2017 23:20:37 +0000 (16:20 -0700)]
make MATCH_FACTORY_ONLY @SystemAPI
cherry-picked from I9e2046b62cb20c5b6651e91f833aff04d45d9800
Bug:
35946061
Test: None; just added an annotation
Change-Id: I604f962b9826700c335eeda9682d3354f6260c40
TreeHugger Robot [Tue, 28 Mar 2017 20:41:08 +0000 (20:41 +0000)]
Merge "Don't allow the negative height of ListPopupWindow" into oc-dev
Todd Kennedy [Mon, 27 Mar 2017 23:32:20 +0000 (16:32 -0700)]
Add extra flag to ApplicationInfoFlags
MATCH_DISABLED_COMPONENTS should be part of ApplicationInfoFlags.
cherry-picked from If6a925c156192ee4663f0cb66d82fc03a86940d6
Change-Id: I048635ff0938f2772d5702de7eb4bc4812ece605
Fixes:
34969805
Test: None; updating annotation
Shunta Sato [Fri, 4 Nov 2016 09:57:39 +0000 (18:57 +0900)]
Don't allow the negative height of ListPopupWindow
Symptom:
If an application set a negative height to the popup list,
surfaceflinger is crashed with SIGABRT.
Root cause:
WindowManagerService dose not expect negative
height of ListPopupWindow. If it's negative,
WindowManagerService set the negative value to GraphicBufferAlloc,
but GraphicBufferAlloc handle the value as unsigned int,
then surfaceflinger is crashed with SIGABRT.
Solution:
Setting a negative height is a developer error.
We should throw an IAE from setHeigh(int).
Bug:
33441454
Author: Kazuki Nakayama <kazuki.x.nakayama@sonymobile.com>
Change-Id: I5887674d302e567abfe66147de4819cfdf0ef97b
Chad Brubaker [Fri, 24 Mar 2017 22:53:09 +0000 (15:53 -0700)]
Add ACTION_EPHEMERAL_RESOLVER_SETTINGS
This Intent will be used in Settings to show the settings UI for the
Ephemeral resolver. Settings can get the correct component to send the
Intent to by calling
PackageManager.getInstantAppResolverSettingsComponent
Bug:
35918998
Test: Boots
Change-Id: I0edcf85704f2c19e0ee27f91b6ef057d52e32778
(cherry picked from commit
aa49cb86e6d5f23d82c97db32c848bc4ea2b81bc)
Andreas Gampe [Tue, 28 Mar 2017 17:59:25 +0000 (10:59 -0700)]
ActivityManager: Allow DiskRead for wrap.sh determination
Avoid killing debuggable apps which at the same time have a strict-mode
policy installed.
(cherry picked from commit
62be34e32e72323e917bebb9ca39eb911e7d9371)
Bug:
33668201
Test: m
Change-Id: Ic3c56b01fe42a473e28c1d6280526afdc85793df
Bryce Lee [Tue, 21 Mar 2017 16:41:37 +0000 (09:41 -0700)]
Add configuration for maximum UI width.
This changelist adds config_maxUiWidth, a new system resource
configuration which specifies the maximum width the user interface
can operate in. If the physical or specified width is greater than
this value, dimensions and density are scaled down accordingly. The
native mode resolution can be still discovered through
Display.Mode#getPhysicalWidth/getPhysicalHeight.
Test: Defined override for development device and verified values.
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests#testMaxUiWidth
Change-Id: I12e7ad52f2aa8014e143bc7e80b020c9b24ed9c8
Fixes:
25820708
Robert Carr [Mon, 27 Mar 2017 22:46:27 +0000 (15:46 -0700)]
SurfaceView: Make surfaceRedrawNeededAsync work with WM bypass.
Prior to SurfaceView bypassing the WM, the WM would see that
the app had multiple windows and wait for them all
to finish drawing before beginning any animation, or similar operations.
Now that SurfaceView is invisible to the WM we have to replicate this
two-way latching in ViewRootImpl.
Bug:
36492285
Test: Launch Chrome over and over.
Change-Id: Ie72c2d394f1bb0eb8551e6f63bb1c19a5df43afd
Andrii Kulian [Wed, 22 Mar 2017 02:37:09 +0000 (19:37 -0700)]
Move activity to display on launch
When an activity is launched with displayId specified and there
is an existing matching task on some other display - that task
should be move to the target display.
Bug:
34396961
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testMoveToDisplayOnLaunch
Change-Id: I18b1f0de320039f4f1ac4e248f048a367f886d29
(cherry picked from commit
ede131cce47a1d2ebafd25156e5caf26eb880136)
Adam Lesinski [Thu, 16 Mar 2017 23:54:23 +0000 (16:54 -0700)]
AAPT: Version <adaptive-icon> to v26
Bug:
35908647
Test: manual
Change-Id: Ic8f43efe34385192fbab18675eb5898ed80912a5
Conrad Chen [Mon, 27 Mar 2017 20:22:06 +0000 (13:22 -0700)]
TIF: open transient columns to public
Test: build
Bug:
36557756
Change-Id: Ieb45ee5e6bd27fb33d84799ec1510a410ff7b027
TreeHugger Robot [Tue, 28 Mar 2017 18:39:42 +0000 (18:39 +0000)]
Merge "WifiManager(aidl): Remove pingSupplicant binder call" into oc-dev
Makoto Onuki [Tue, 28 Mar 2017 18:39:32 +0000 (11:39 -0700)]
Correctly set thread group to UiThread's thread.
Bug:
36683525
Test: Manual (booted and launched several apps.)
Change-Id: Iff65b306e302aa2aaa2321d3faf254414f9ce1e7
Sanket Padawe [Tue, 28 Mar 2017 18:38:35 +0000 (18:38 +0000)]
Merge "String changes for Voice/Data/Emergency service blocked." into oc-dev
Sanket Padawe [Mon, 27 Mar 2017 23:43:25 +0000 (16:43 -0700)]
String changes for Voice/Data/Emergency service blocked.
Bug:
31490566
Change-Id: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
(cherry picked from commit
acc0a4481ce83489c05af1d70e66362eaf7f04a1)
Merged-in: Iaae2c5ef2a856ae265d4e4ea933d714491744e49
Romain Guy [Wed, 22 Mar 2017 18:08:37 +0000 (11:08 -0700)]
Update Color API
Make the class final because its instances are immutable and
it contained only static methods prior to O. Fix a couple of
typos/issues reported by external developers. Add a new variant
of getComponents() to avoid allocations, as requested by
external dev.
Test: Color_ColorLongTest
Bug:
32984164
Change-Id: I3c22e124c9fdf66142d530afa4beb05fe0669359
(cherry picked from commit
48f38f18385e8aed0df48524d8ea3d20eba9199f)
Dongwon Kang [Tue, 28 Mar 2017 18:20:24 +0000 (18:20 +0000)]
Merge "MediaSession: clear identity before accessing service methods" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 18:16:55 +0000 (18:16 +0000)]
Merge "QS: Don't animate first state change" into oc-dev
Dongwon Kang [Tue, 28 Mar 2017 17:54:46 +0000 (10:54 -0700)]
MediaSession: clear identity before accessing service methods
Test: build and manually verified the issue is fixed.
Bug:
36669550
Change-Id: I44eda4e2fb08dd9aa6972b12ed4c4e82797ff587
TreeHugger Robot [Tue, 28 Mar 2017 18:15:40 +0000 (18:15 +0000)]
Merge "Catch IllegalArgumentException to avoid SyncManager crash" into oc-dev
Jason Monk [Mon, 27 Mar 2017 20:41:24 +0000 (16:41 -0400)]
QS: Don't animate first state change
Test: runtest systemui
Change-Id: I151af59665c74ca04839f7d33153fb8c90ddd996
Fixes:
36076790
(cherry picked from commit
2b48aa3f71403f41f6d6b90cfe437ee4bdce160f)
Jason Monk [Mon, 27 Mar 2017 19:18:23 +0000 (15:18 -0400)]
Fix QS getting stuck in weird animation during recreate
Don't animate on first state change in QS, no reason to animate on
bootup or recreate.
Test: runtest systemui
Change-Id: Ib1ceddd708fdc922224b57dbfe12d2f9a76fcee3
Fixes:
35116271
(cherry picked from commit
2da4619b12a4c65a645534079057e7d2bb0bae21)
Jason Monk [Mon, 27 Mar 2017 17:40:59 +0000 (13:40 -0400)]
Have QS fragment keep track of some state on recreate
Test: runtest systemui
Change-Id: I1cf84a0943092fcfc5428fcfccb4a887a83b294b
Fixes:
35205198
Fixes:
36592148
(cherry picked from commit
78187249c3e8aaf89a380816e123a3a4653d5b4e)
TreeHugger Robot [Tue, 28 Mar 2017 17:46:10 +0000 (17:46 +0000)]
Merge "Fix double-checked locking in InputMethodSubtype" into oc-dev
Amith Yamasani [Tue, 28 Mar 2017 17:34:01 +0000 (10:34 -0700)]
Catch IllegalArgumentException to avoid SyncManager crash
When SyncManager's scheduling races with an app with a sync
adapter being uninstalled, it can get an IAE from PackageManager.
Catch this exception and skip over the job.
Bug:
36658118
Test: Manual
Change-Id: I0a63a3e0aa19cb5685aa18c7c6c9d6dd6ccfd60a
Andrii Kulian [Tue, 28 Mar 2017 02:25:24 +0000 (19:25 -0700)]
Add Configuration param to onMovedToDisplay
To be consistent with other multi-window callbacks adding
Configuration param to the onMovedToDisplay, so that app
developer can handle configuration change at the same time
when it receives a notification about move.
Bug:
36649499
Test: android.server.ActivityManagerDisplayTests
Test: #testOnMovedToDisplayCallback
Change-Id: I80c765473bfc09ea1fb7aa4e2e77baf3b21606b8
(cherry picked from commit
2c32a11a71e2a1602b188b710b1916d919d99edb)
Jason Monk [Mon, 27 Mar 2017 19:45:32 +0000 (15:45 -0400)]
Don't auto-mirror QS drawables
Was a mistake in previous refactor, they were not being mirrored
before.
Test: visual
Change-Id: I001757ca02267e33409a9c0071a24b69939f30c5
Fixes:
36255688
Fixes:
36255681
(cherry picked from commit
19378fd3ebdc51718993dac065d68b286a03d90a)
Pavel Grafov [Tue, 28 Mar 2017 17:15:53 +0000 (17:15 +0000)]
Merge "Store up to 5 network log batches if needed." into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 17:15:36 +0000 (17:15 +0000)]
Merge "Restart USB stack if data transfer becomes unavailable" into oc-dev
Jason Monk [Mon, 27 Mar 2017 14:42:51 +0000 (10:42 -0400)]
Speculative fix for QS CTS test
Explicitly send broadcasts to systemui, because thats where they are
going.
Test: cts
Change-Id: I2fdc74f2cf874e818ef52f37a58adf7cd38ca455
Fixes:
35704517
(cherry picked from commit
c7f71110958cbeb4343bd9220fd1526ae066e75c)
TreeHugger Robot [Tue, 28 Mar 2017 17:11:21 +0000 (17:11 +0000)]
Merge "Support loading a stub WebView using a donor package." into oc-dev
Roshan Pius [Tue, 21 Mar 2017 21:13:52 +0000 (14:13 -0700)]
WifiManager(aidl): Remove pingSupplicant binder call
This is now deprecated in the public API and instead calls
isWifiEnabled(). So, remove this AIDL call.
Bug:
36493092
Test: Compiles
Change-Id: I6339d5bb18f423d84fa9222a87e2df7eb9c336a9
Merged-In: I6339d5bb18f423d84fa9222a87e2df7eb9c336a9
TreeHugger Robot [Tue, 28 Mar 2017 16:52:21 +0000 (16:52 +0000)]
Merge "Throw an error if no package name is provided by the app when needed" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 16:44:17 +0000 (16:44 +0000)]
Merge "Fix stretched nav bar menu icon" into oc-dev
George Mount [Wed, 22 Mar 2017 14:18:45 +0000 (07:18 -0700)]
Make public getFragments() and onGetLayoutInflater() methods
Bug
34703669
Test: I71856306a7bb67aacb84be17165e7e095653c20a
Change-Id: I41999d0f5e6d75afebbbf67ad5bf49fa0cca509e
Pavel Grafov [Thu, 23 Mar 2017 15:17:52 +0000 (15:17 +0000)]
Store up to 5 network log batches if needed.
In the normal mode when the DO fetches the logs ASAP, there will still be
no more than one last full batch in memory at once. If the DO is too slow,
or the broadcast queue is too crowded we will store up to 5 of them,
discarding older ones when there are more than 5.
Also the batch gets discarded 5 minutes after it has been retrieved or
another more recent batch has been retrieved. Previously the last batch
would stay in memory until the next one is ready. But it seems
unreasonable for the DO to rely on it since there are no guarantees.
This would probably even save some memory under normal conditions on
average.
Bug:
35753013
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: Ib8e91a98103d804375cb0d7423f93175b4b9bcb6
(cherry picked from commit
48733074d7ba80755e40432b7ff02b66e27d3edb)
Merged-in: Ib8e91a98103d804375cb0d7423f93175b4b9bcb6
Amith Yamasani [Fri, 24 Mar 2017 00:53:47 +0000 (00:53 +0000)]
Revert "Logging to track #
36406078"
Not needed anymore, since the bug was found to be in the binder driver.
This reverts commit
9afb1fc495aa132c4a5e3a5beca408597ab1bb09.
Change-Id: I3891866f6e30a3f3391df8005e56bf9b9777b3a6
(cherry picked from commit
ab5523f3372b9e36911aa25a8247f0a2fa16543a)
Chad Brubaker [Thu, 23 Mar 2017 21:42:39 +0000 (14:42 -0700)]
Throw an error if no package name is provided by the app when needed
Avoid crashing system server if a calling app does not provide a package
name to broadcastIntent, instead throw an exception back.
Bug:
36452829
Test: Devices boots, apps work
Change-Id: Ie67ad4b631f399e674449e0787ed8fab47b89cb6
(cherry picked from commit
674702f0f99091c86bb3eb66572c88304de38a6b)
Torne (Richard Coles) [Fri, 13 Jan 2017 14:19:39 +0000 (14:19 +0000)]
Support loading a stub WebView using a donor package.
Support loading a WebView package which specifies the name of a "donor"
that provides missing files. This allows a preinstalled stub WebView to
function by loading its code and assets from the preinstalled Monochrome
implementation, as long as the versions are close enough that the
manifest contents are compatible, which should be fine since
preinstalled versions will match.
To do this, we replace the stub's code paths in AppplicationInfo with
the donor's, so that all Java and native code and resources are loaded
from the donor APK at runtime instead of from the (mostly empty) stub.
To get the ClassLoader with the modified path cached as if it was the
regular path, we introduce a new "cacheKey" parameter in
ApplicationLoaders.
Bug:
21643067
Test: build "new" stub WebView upstream in chromium and test loading
Change-Id: I08cc9122b1c9def3e1206974f3e0e8973cca3419
Jason Monk [Mon, 27 Mar 2017 20:28:55 +0000 (16:28 -0400)]
Fix battery saver tile label
Test: visual
Change-Id: I2cfb819778eeb969979aa2a3ed8c35744a63f875
Fixes:
36238774
(cherry picked from commit
368a8aec2c13ca096f6e3c15c1cb70e4a3752d4c)
Jason Monk [Mon, 27 Mar 2017 21:09:30 +0000 (17:09 -0400)]
QS Animation tweaks
Test: visual
Change-Id: Ic81d874511bf87fb0e8d9bf08e27346919ebc46e
Fixes:
35990413
(cherry picked from commit
c34e249609dadc86bf3a0139a4038388c34a42b6)
Jason Monk [Mon, 27 Mar 2017 20:54:30 +0000 (16:54 -0400)]
Fix spacing for loading in QS
Test: visual
Change-Id: I8065885ec3d2badd9d7c2116a6075eb48e2b7697
Fixes:
30292983
(cherry picked from commit
6cfc63a92779c000c659c70f44efa231fce73476)
Esteban Talavera [Fri, 24 Mar 2017 16:31:56 +0000 (16:31 +0000)]
Restart USB stack if data transfer becomes unavailable
If DISALLOW_USB_FILE_TRANSFER is set while the device is
connected via USB and data transfer is enabled, restart
the USB stack to make sure that data cannot be transferred any more
Fix:
34487750
Bug:
34054991
Test: Checked that files cannot be transferred any more as soon as the user restriction is set
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.UserRestrictionsTest
Change-Id: I129c226e57da2d0be356f93436b36b3303cb604c
Jason Monk [Mon, 27 Mar 2017 21:40:56 +0000 (17:40 -0400)]
Fix stretched nav bar menu icon
Make sure that KeyButtonDrawable centers its child layers in case
they aren't the same size (like menu).
Test: visual
Change-Id: I10cbbac2f74288c3ca570d48ac23a1101dbab4e0
Fixes:
34102319
(cherry picked from commit
5b3b485593934f852b6e4193b9f1e0f492b674b6)
Tadashi G. Takaoka [Fri, 24 Mar 2017 08:22:33 +0000 (17:22 +0900)]
Fix double-checked locking in InputMethodSubtype
No functional change.
Fixes:
35737935
Test: run cts test and confirmed all tests passed
cts-tradefed run singleCommand cts-dev -m CtsInputMethodTestCases
Change-Id: I44e5e91b6462c3c7d023f50365b30da9cf98c509
TreeHugger Robot [Tue, 28 Mar 2017 14:23:18 +0000 (14:23 +0000)]
Merge "SmartSelection: Pass hintFlags to native library." into oc-dev
Anton Philippov [Mon, 27 Mar 2017 13:49:04 +0000 (14:49 +0100)]
Add null check in BackupManagerService$PerformBackupTask.handleCancel()
handleCancel() can be called before we start backing up any particular
package, therefore we need to properly handle log messages in that case.
Bug:
36638539
Test: manual
Change-Id: Ic96e2fbad5c0a79640a3419d187e8b5e4d265de3
(cherry picked from commit
519a87db8fabb49f299aa384aeb5cfe4dfedf907)
Abodunrinwa Toki [Mon, 27 Mar 2017 20:09:23 +0000 (21:09 +0100)]
SmartSelection: Pass hintFlags to native library.
Test: cts-tradefed run cts-dev -m CtsViewTestCases -t android.view.textclassifier.cts.TextClassificationManagerTest
Tests have been written on the native side.
Bug:
35416389
Change-Id: If2de73391e1a343e0dc7698039ad1464cedfbf08
fen wang [Tue, 28 Mar 2017 05:19:29 +0000 (05:19 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options" am:
5c64adef5f am:
40dca362a0
am:
d09d9370da
Change-Id: I9cb8bf8e0b42c13fd4bfdeb661680b8737e0b42f
fen wang [Tue, 28 Mar 2017 05:11:20 +0000 (05:11 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options" am:
5c64adef5f
am:
40dca362a0
Change-Id: I7b59dc216d893553b146ad6e68f2706255d9f860
fen wang [Tue, 28 Mar 2017 05:03:27 +0000 (05:03 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options"
am:
5c64adef5f
Change-Id: Iff2e13b8c8921c47176fc43e2a35ebd4cd284a96
Treehugger Robot [Tue, 28 Mar 2017 04:54:19 +0000 (04:54 +0000)]
Merge "Add Bluetooth LDAC ABR UI to the Developer Options"
fen wang [Mon, 13 Mar 2017 10:35:09 +0000 (19:35 +0900)]
Add Bluetooth LDAC ABR UI to the Developer Options
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Phil Weaver [Tue, 28 Mar 2017 03:58:12 +0000 (03:58 +0000)]
Merge "Fix permission checking for a11y volume."
TreeHugger Robot [Tue, 28 Mar 2017 03:25:58 +0000 (03:25 +0000)]
Merge "Add honored args when auto-paging."
Erik Kline [Tue, 28 Mar 2017 02:38:20 +0000 (02:38 +0000)]
Merge "Add null check to IpManager.dump()" am:
58406d1df2 am:
c5bca697ba
am:
e398bae572
Change-Id: I172f23945a79191b777e2daf6795e2d228f510a6
Erik Kline [Tue, 28 Mar 2017 02:34:15 +0000 (02:34 +0000)]
Merge "Add null check to IpManager.dump()" am:
58406d1df2
am:
c5bca697ba
Change-Id: Id5ebbea0c64baa24d162c0545d45915c948f45e6
Erik Kline [Tue, 28 Mar 2017 02:30:18 +0000 (02:30 +0000)]
Merge "Add null check to IpManager.dump()"
am:
58406d1df2
Change-Id: I68f644a305d58e1396522d73c0983e1eb201cb1c
Treehugger Robot [Tue, 28 Mar 2017 02:19:21 +0000 (02:19 +0000)]
Merge "Add null check to IpManager.dump()"
TreeHugger Robot [Tue, 28 Mar 2017 02:14:33 +0000 (02:14 +0000)]
Merge "Remove ACTION_CONFIGURE_WIFI_SETTINGS and ACTION_WIFI_SAVED_NETWORK_SETTINGS."
TreeHugger Robot [Tue, 28 Mar 2017 02:12:04 +0000 (02:12 +0000)]
Merge "Introduced additional lock - dbLock"
TreeHugger Robot [Tue, 28 Mar 2017 02:10:43 +0000 (02:10 +0000)]
Merge "Camera: Send onPrepared callback to all shared surfaces"
TreeHugger Robot [Tue, 28 Mar 2017 02:02:30 +0000 (02:02 +0000)]
Merge "Fix issue with task overlay activities not finishing."