OSDN Git Service
TreeHugger Robot [Thu, 4 May 2017 19:17:57 +0000 (19:17 +0000)]
Merge "Fix an NPE that can result from a race condition." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 18:24:52 +0000 (18:24 +0000)]
Merge "Remove default network recommendation provider." into oc-dev
Dianne Hackborn [Thu, 4 May 2017 17:28:08 +0000 (17:28 +0000)]
Merge "Fix issue #
37938835: Undismissable "Camera is running in the..." into oc-dev
Brad Ebinger [Thu, 4 May 2017 17:11:46 +0000 (17:11 +0000)]
Merge "Better handle MSIM DDS changed event" into oc-dev
Winson Chung [Thu, 4 May 2017 16:16:28 +0000 (16:16 +0000)]
Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 15:15:30 +0000 (15:15 +0000)]
Merge "Only classify text when the toolbar is shown." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 14:08:58 +0000 (14:08 +0000)]
Merge "Developer setting to show toast for notifications without a channel" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 13:23:46 +0000 (13:23 +0000)]
Merge "ignore exception calling unlinkToDeath" into oc-dev
Abodunrinwa Toki [Wed, 3 May 2017 19:22:55 +0000 (20:22 +0100)]
Only classify text when the toolbar is shown.
classifyText() is used to generate a menu item in the selection toolbar
to handle the selected text. In this cl we avoid calling classifyText()
when the selection is changing but instead call it when we are about to
show the toolbar.
Previously, we depended on invalidateActionModeAsync() to classify text
after a call to startActionMode(). Now that we've introduced
invalidateActionMode() we need to be able to tell
startSelectionActionMode() that we also want the text to be classified,
hence the introduction of an input parameter, "adjustSelection", to
startSelectionActionModeAysnc().
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
34966796
Change-Id: I5b9fc9e8ab443f024f8ca461df5a4bcc6485d26b
TreeHugger Robot [Thu, 4 May 2017 11:26:53 +0000 (11:26 +0000)]
Merge "Handle volume keys to apps in Vr mode" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 08:43:59 +0000 (08:43 +0000)]
Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 06:35:48 +0000 (06:35 +0000)]
Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 06:27:29 +0000 (06:27 +0000)]
Merge "Allow TIMEZONE_CHANGED to launch apps" into oc-dev
Sundeep Ghuman [Wed, 3 May 2017 19:45:44 +0000 (12:45 -0700)]
Fix an NPE that can result from a race condition.
NetworkInfo and WifiInfo are set via broadcast receiver so while in a
true stable state network info should not be null if wifi info is, this
can occur in rare instances due to a race condition. It is convention in
AccessPoint.java to always null check network info.
Bug: b/
37951301
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: Ia1b357c84b961a555ec24a5b930ade35ddf8dbba
Karthik Ravi Shankar [Thu, 4 May 2017 05:17:13 +0000 (05:17 +0000)]
Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev
Karthik Ravi Shankar [Mon, 1 May 2017 08:34:19 +0000 (01:34 -0700)]
Rename CompatibilityDisplay to Vr2dDisplay
CompatibilityDisplay used for displaying 2D activities in Vr world. This
is confusing in more than one way. To clarify what it really means,
rename it to Vr2dDisplay.
Changes in this CL -
- /s/CompatibilityDisplay/Vr2dDisplay
- /s/Compatibility/Vr2d - in CompatibilityDisplay context.
Bug:
37851944
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests
passes on Marlin.
Change-Id: I0a442302fa9d0f48bbd0c01a7766b94369e04386
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
TreeHugger Robot [Thu, 4 May 2017 02:51:58 +0000 (02:51 +0000)]
Merge "Added TaskSnapshotCacheTest back to presubmit" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 01:47:00 +0000 (01:47 +0000)]
Merge "Always start a manual request, even if view was already autofilled." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 01:37:02 +0000 (01:37 +0000)]
Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev
Christopher Tate [Thu, 4 May 2017 01:10:39 +0000 (18:10 -0700)]
Allow TIMEZONE_CHANGED to launch apps
Bug
37866305
Test: manual
Change-Id: If15df909e99e910c012f2a7b33ae8600c0f97d8d
Dianne Hackborn [Thu, 4 May 2017 01:04:05 +0000 (18:04 -0700)]
Fix issue #
37938835: Undismissable "Camera is running in the...
...background" notification even after force stopping camera
Ensure we have a message scheduled to dismiss the next app every
time we go through the app list. Also don't show the notification
for an app when it is in the foreground.
Test: manual
Change-Id: Idd93c8d9f8252b880c8b4bf069c71ad71a6b27c9
TreeHugger Robot [Thu, 4 May 2017 01:03:56 +0000 (01:03 +0000)]
Merge "Revert "Don't add other's child as header or footer"" into oc-dev
Calin Juravle [Thu, 4 May 2017 00:35:39 +0000 (00:35 +0000)]
Merge "Fix potential race in DexManager" into oc-dev
Siyamed Sinir [Thu, 4 May 2017 00:27:27 +0000 (00:27 +0000)]
Merge "Don't copy NoCopySpans for assist and autofill" into oc-dev
Sudheer Shanka [Thu, 4 May 2017 00:26:52 +0000 (00:26 +0000)]
Merge "Reduce the timeout for waiting for the network state update." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 00:14:13 +0000 (00:14 +0000)]
Merge "Avoid reading HW bitmap pixels twice" into oc-dev
Matthew Ng [Tue, 2 May 2017 23:47:53 +0000 (16:47 -0700)]
Reset touch location after touch slop is exceeded in recents
There was a jump when a user touch moves over the slop value. To fix
this the location is updated to new y position so that the move
animation of the card after has no visual jump.
Change-Id: Ia9b1d04cc0b2983c2e61114ebbf3bdeb154404e9
Fixes:
35720341
Test: manual - enter recents and slowly drag a card vertically and
notice no jump with the fix, moving after the slop has a consistent
motion
Ian Pedowitz [Thu, 4 May 2017 00:07:05 +0000 (00:07 +0000)]
Merge "Revert "O is API 26"" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 23:58:19 +0000 (23:58 +0000)]
Merge "Grant ephemeral app access during service bind" into oc-dev
Sujith Ramakrishnan [Wed, 3 May 2017 23:56:18 +0000 (23:56 +0000)]
Merge "Accessibility shortcut on Android TV." into oc-dev
Joe LaPenna [Fri, 28 Apr 2017 18:57:45 +0000 (11:57 -0700)]
Remove default network recommendation provider.
BUG:
37686309
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.netrec.NetRecHostTest
Change-Id: Ia67790172418b7feba97acdb4a6df04506358f87
Todd Kennedy [Wed, 3 May 2017 23:38:44 +0000 (16:38 -0700)]
ignore exception calling unlinkToDeath
Change-Id: If3fdb2ca46f8118d9d2859fc932b4614bb62220e
Fixes:
37893511
Test: Manual
Hemant Gupta [Thu, 5 Nov 2015 08:42:01 +0000 (14:12 +0530)]
Bluetooth: OBEX: Don't close transport when obex is disconnected
Precondition: PTS 7.0
Usecase:
Execute test case TC_TG_CA_BI_02_C for AVRCP 1.6
Expectation:
Test case should pass
Observation:
Test case fails
Root cause:
Disconnection of OBEX from PTS leads to disconnection of transport
(initiated by DUT) leading to test case failure. Obex server was
unnecessary assuming that transport would be disconnected so was
informing registered users that transport has been disconnected,
which was leading to issues on new obex connect on same transport
channel from remote obex client
Fix:
Remove check to break out of loop after obex disconnection, as that is
already handled in case when read would return -1 in case transport
is closed.
Test: TC_TG_CA_BI_02_C can be passed after the patch.
Bug:
35590000
Change-Id: Ic1682ce77c07cf2e43da09dc95fff2214338f758
(cherry picked from commit
850758fb63ded57acf218341812ead95f7159ad6)
TreeHugger Robot [Wed, 3 May 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
Brad Ebinger [Tue, 18 Apr 2017 18:43:42 +0000 (11:43 -0700)]
Better handle MSIM DDS changed event
On DSDS MSIM devices, when Default Data Subscription event
is received, the ImsService may choose to switch which
Slot ID is active.
This change better handles that switch and removes a
crash that was happening due to
ImsServiceProxy#getFeatureStatus getting called
circularly.
Bug:
37361882
Test: Run Telephony unit tests
Merged-In: I55cac364221c728ad1c77be783c358e8d98ec2b4
Merged-In: I68cd04f288f2d7006a2c55cba3584fd74117a1b8
Change-Id: Iaa29bba25f82e699c96b951b3b110568163e12d8
TreeHugger Robot [Wed, 3 May 2017 22:57:07 +0000 (22:57 +0000)]
Merge changes from topic 'allow_none_scorer' into oc-dev
* changes:
Revert permission check on setActiveScorer.
Allow the active scorer to be set to NULL.
Randy Pan [Wed, 3 May 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Add network disabled reason starting index" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:39:04 +0000 (22:39 +0000)]
Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:38:23 +0000 (22:38 +0000)]
Merge "Make all FrameBuilderTests run on RT" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 22:15:23 +0000 (22:15 +0000)]
Merge "Use timeout for *dexopt* wake lock" into oc-dev
Ian Pedowitz [Wed, 3 May 2017 22:00:56 +0000 (22:00 +0000)]
Revert "O is API 26"
This reverts commit
9bcef8e2da32ba959b61a0b400adfe9fde1a2a10.
Reason for revert: b/
37355569
Bug:
37480230
Bug:
37355569
Change-Id: I39b4a7fd9bda77df0746c7bc32b87f0c2b722f2b
TreeHugger Robot [Wed, 3 May 2017 21:22:44 +0000 (21:22 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev
Adrian Roos [Wed, 3 May 2017 21:11:36 +0000 (21:11 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 20:54:27 +0000 (20:54 +0000)]
Merge "Send AutofillValue of Views that originated a forced request." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 20:21:39 +0000 (20:21 +0000)]
Merge "AOD: Pass through pulse reason to DozeUi" into oc-dev
Chris Tate [Wed, 3 May 2017 20:15:49 +0000 (20:15 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev
Tony Mak [Tue, 2 May 2017 15:31:25 +0000 (16:31 +0100)]
selectBackupTransportAsync should report failure when backup is not available
Merged-in: I393308857ea6082dca167e3e417b946615a83c20
Fix:
37304539
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
Test: setup device owner, then set up profile.
Ensure tapping Settings->Google->Work->Security -> Verify app
is working
Change-Id: I88c3e3163605d62123c88377ae0843084e354212
TreeHugger Robot [Wed, 3 May 2017 19:50:53 +0000 (19:50 +0000)]
Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev
Wei Wang [Wed, 3 May 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Fix RttManager documation unit issue." into oc-dev
Jeff Sharkey [Wed, 3 May 2017 19:25:08 +0000 (19:25 +0000)]
Revert "Don't add other's child as header or footer"
This reverts commit
358d0d329785a225449aa9c8aea7fcc2c7bec741.
This CL resulted in b/
37933333 regression, so it'll have to re-land with a target API check.
Change-Id: I1c2e4de43a15c1851d98f6aff432585ada80fb5b
Felipe Leme [Wed, 3 May 2017 17:04:02 +0000 (10:04 -0700)]
Always start a manual request, even if view was already autofilled.
Fixes:
36034784
Test: CtsAutoFillServiceTestCases pass
Test: testAutofillManuallyAgainAfterAutomaticallyAutofilledBefore()
Test: testAutofillManuallyAgainAfterManuallyAutofilledBefore()
Change-Id: Ided8c42367b71766772bd364445510848db2adce
TreeHugger Robot [Wed, 3 May 2017 19:04:29 +0000 (19:04 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev
Winson Chung [Wed, 3 May 2017 01:15:16 +0000 (18:15 -0700)]
Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag.
- When launching an activity with CLEAR_TASK and NEW_TASK, the result code
of the start is START_SUCCESS, but we still need to notify SystemUI to
expand the PiP. However, because the PiP transition now waits for the
first draw, this can cause severe jank and delay if the original activity
is a trampoline activity. As a workaround, we immediately move the task
to the fullscreen stack when clearing and restarting the task to ensure
that the new task shows without delay.
Bug:
37501224
Test: Open YT in PIP, launch sub-shortcut from Home
Change-Id: I16bebf19b082f30695e99da1d93bc4adf5e9df0c
TreeHugger Robot [Wed, 3 May 2017 18:49:14 +0000 (18:49 +0000)]
Merge "TextClassifier: Append to url intents that need one." into oc-dev
Karthik Ravi Shankar [Fri, 28 Apr 2017 22:35:58 +0000 (15:35 -0700)]
Handle volume keys to apps in Vr mode
When a device is in Vr mode -
- Volume key event must be passed to the audio subsystem to reflect
changes when the configuration is enabled.
- When the configuration is disabled, neither the apps not the audio
subsystem should be able to receive the volume key events
Bug:
37625887
Bug:
36280728
Test:
- Verified that the app doesn't receive volume events
- Verified that the system volume bar is also not triggered
Change-Id: I245f7797873f764d0b017879723a6dbff1bb4d36
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
Calin Juravle [Wed, 3 May 2017 01:50:56 +0000 (18:50 -0700)]
Fix potential race in DexManager
The internal cache of DexManager holding information about the code
locations may race if an install happens at the same time with a dex
load.
Test: runtest -x services/tests/servicestests/src/com/android/server/pm/dex/DexManagerTests.java
Bug:
37922353
Change-Id: Ia28fb54d6859ec185aaaf8e0ed68981004b173e5
Narayan Kamath [Wed, 3 May 2017 18:03:03 +0000 (18:03 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 18:02:49 +0000 (18:02 +0000)]
Merge "Only remove task if activity fails to start." into oc-dev
Rob Carr [Wed, 3 May 2017 18:01:11 +0000 (18:01 +0000)]
Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev
Chris Craik [Wed, 3 May 2017 17:53:16 +0000 (10:53 -0700)]
Make all FrameBuilderTests run on RT
Fixes:
33834637
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests --gtest_filter=FrameBuilder.renderNode_OpenGL
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests --gtest_filter=FrameBuilder.projection*
They essentially all use Caches, so making RT-only for safety. This
prevents crashes when trying to access Caches in a non-rt test, when
it's not guaranteed to be created.
Change-Id: I530c73d0ffe2d4f4ef53a46715f5bcca2c485f70
Yifan Hong [Tue, 2 May 2017 01:43:36 +0000 (18:43 -0700)]
Add compatibility matrices to VintfObject.report()
Test: FrameworksCoreTests
Bug:
36814503
Change-Id: I27eaea136437afb2102581d410b657e810612a0a
Geoffrey Pitsch [Wed, 19 Apr 2017 14:26:45 +0000 (10:26 -0400)]
Developer setting to show toast for notifications without a channel
Bug:
37945054
Test: runtest systemui-notification
Change-Id: I264913c3d7ef6fcd83129b0692e96d3218bc7217
TreeHugger Robot [Wed, 3 May 2017 17:29:16 +0000 (17:29 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev
Wale Ogunwale [Wed, 3 May 2017 14:54:23 +0000 (07:54 -0700)]
Added TaskSnapshotCacheTest back to presubmit
The problem the test was having was fixed by ag/
2179887
Also, fixed NPE during test tear down.
Change-Id: I974fcb9a12928dd4494525f9bae5c7c448657e30
Fixes:
35196891
Bug:
37682538
Test: TaskSnapshotCacheTest
TreeHugger Robot [Wed, 3 May 2017 17:08:21 +0000 (17:08 +0000)]
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 17:02:10 +0000 (17:02 +0000)]
Merge "Night display status restores on reboot/user change" into oc-dev
Jesse Evans [Wed, 3 May 2017 16:57:16 +0000 (09:57 -0700)]
Grant ephemeral app access during service bind
Currently we only grant ephemeral access during sendServiceArgs,
but since bindService does not actually send service arguments
the code path to grant ephemeral access is not currently hit.
This change grants ephemeral access during bindServiceLocked after
the association between the calling app and the target service has
been established.
Test: existing tests.
Bug:
37766185
Change-Id: I64847a2dcaf1255c0a7d663c4461cda62655a8d0
Julia Reynolds [Wed, 3 May 2017 16:50:27 +0000 (16:50 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
Chen Xu [Wed, 3 May 2017 16:42:43 +0000 (16:42 +0000)]
Merge "support locale change for notification channels" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 16:30:19 +0000 (09:30 -0700)]
Prevent NPE in startActivityUnchecked
Test: manual
Bug:
37931794
Change-Id: I4a968e12cfa99d347f19a8cf2a3b9fba1bf1715b
TreeHugger Robot [Wed, 3 May 2017 16:21:36 +0000 (16:21 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 16:13:10 +0000 (16:13 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 15:39:26 +0000 (15:39 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
Jorim Jaggi [Wed, 3 May 2017 13:21:26 +0000 (15:21 +0200)]
Fix snapshots for secure windows
First, also draw system bar backgrounds when drawing a fake
snapshot. For that, refactor the drawing into a separate class so
it can be reused. Also enable fake snapshots for secure windows.
Test: com.android.server.wm.TaskSnapshotControllerTest
Test: com.android.server.wm.TaskSnapshotSurfaceTest
Test: Secure activity with resuming delay, make sure system bars
are covered when reopening app.
Bug:
35710126
Change-Id: I2f0ebc7e7acb80015780a4e882f0a472599efa30
TreeHugger Robot [Wed, 3 May 2017 15:10:10 +0000 (15:10 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
Christine Franks [Sat, 11 Feb 2017 01:36:10 +0000 (17:36 -0800)]
Night display status restores on reboot/user change
Fixes:
30086742
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I264be077e607baf8e19496f0c57549a907668005
Jason Monk [Wed, 3 May 2017 14:37:34 +0000 (10:37 -0400)]
Fix QS visibility logs missing some info
Test: runtest systemui
Change-Id: I6deb71576b137dfbd51f863e88ad939d4f3fab1b
Fixes:
35454347
Julia Reynolds [Mon, 1 May 2017 13:20:30 +0000 (09:20 -0400)]
Treat apps that use channels as O apps
... even if they don't target O
- Delete misc channel
- Read settings from channel instead of notification
Test: runtest systemui-notification
Change-Id: I00814959eddd10998806dd67cc30421091ae9aab
Fixes:
37540996
Fixes:
35378789
Wale Ogunwale [Tue, 2 May 2017 21:49:04 +0000 (14:49 -0700)]
Only allow AM to update display orientation based on app containers
Activity manager choregraphs several app states when starting an
activity including when the display orientation should be updated based
on the app that is now in the foreground. It is possible for a call to
originate within WM after AM adds the starting app token, but before AM
makes the app visible and resumed. E.g. A relayout call due to a
starting window. When this happens WM can prematurely update the display
orientation with incomplete information causing the starting app to be
in an incorrect orientation initially.
To fix this problem we now only factor in app containers (stacks, task,
..) when updating the display orientation if the call to update is
coming from AM. Otherwise we only use the non-app/system containers to
determine the orientation or return the last orientation.
Change-Id: I431ce9260ee31257732311a548c62cbcdb27eae7
Fixes:
37550022
Test: Launch 2 apps that don't fix orientation and use the recent button
to switch between them while holding the device in landscape.
TreeHugger Robot [Wed, 3 May 2017 13:55:49 +0000 (13:55 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
Julia Reynolds [Tue, 2 May 2017 19:04:34 +0000 (15:04 -0400)]
Sorting and intrusiveness updates
- The intrusiveness extractor needs to know about channels
- Allow comparisons by contact affinity even in the min bucket.
Test: cts-verifier, attention management test
Bug:
36197567
Change-Id: I1bb53d758fc2334aad5e380620fc6e39a724195c
TreeHugger Robot [Wed, 3 May 2017 13:43:14 +0000 (13:43 +0000)]
Merge "DozePlugin: Remove" into oc-dev
Bartosz Fabianowski [Tue, 18 Apr 2017 12:39:23 +0000 (14:39 +0200)]
Add more explicit documentation for install reason
This CL adds more explicit documentation of the install reason argument /
return value to PackageInstaller.SessionInfo.
Bug:
37324584
Test: None
Change-Id: I2450cc669b194e611c5dc07c6a0a5cd78a98c039
TreeHugger Robot [Wed, 3 May 2017 13:16:27 +0000 (13:16 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
Geoffrey Pitsch [Wed, 3 May 2017 13:15:16 +0000 (13:15 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 12:35:17 +0000 (12:35 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
Jorim Jaggi [Tue, 2 May 2017 12:10:58 +0000 (14:10 +0200)]
Avoid reading HW bitmap pixels twice
Both createScaledBitmap and compress read it back to regular
memory. Avoid that by creating an intermediate software bitmap.
Test: TaskSnapshotPersisterLoaderTest
Bug:
37631016
Change-Id: Id03fa3f6a827d3bd39f8fe4fddfc2d32139dac9b
Johan Torås Halseth [Wed, 26 Apr 2017 20:20:32 +0000 (21:20 +0100)]
Increase timeout for ADB backup/restore of SharedStorage.
It previously used a backup timeout of 5 min, and restore timeout of 1
min, that would always timeout if the files on shared storage were big.
Now increase both to 60 minutes.
Bug:
37201952
Test: adb backup -shared && adb restore backup.ab
Merged-In: Ice6648554933baf76e96fd151b506564487c91c6
Change-Id: I99095249e960fd47fc742154bc513347bf506548
Jorim Jaggi [Tue, 2 May 2017 16:02:46 +0000 (18:02 +0200)]
Fix lock contention: Call into power manager service from handler
Make sure to not hold the wm lock when calling into power manager
service, because PWM will acquire a lock that might be contended.
Test: Make sure user activity timeout is still respected on
Keyguard
Test: Have activity with screenBrightness=1.0, make sure screen
is fully bright when opened
Bug:
37888898
Bug:
36631902
Change-Id: I4b5433dbaf8aa151465ae32232d3b3b8597715df
Narayan Kamath [Wed, 3 May 2017 09:39:29 +0000 (10:39 +0100)]
preloaded-classes: Add android.text.Html$HtmlParser
This class creates a singleton HTMLSchema instance in <clinit> and
we want this done in the zygote. HTMLSchema.<init> is too large for
the compiler and can allocate ~100k of objects on the heap. This also
saves ~50ms in the execution of Html.fromHtml on a lightly loaded
marlin-userdebug.
Test: manual
Bug:
36678451
Change-Id: Icdd3af35018bbe283b3e3690c696e6517452165d
TreeHugger Robot [Wed, 3 May 2017 09:42:01 +0000 (09:42 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 07:31:44 +0000 (07:31 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
Antony Sargent [Wed, 26 Apr 2017 23:37:53 +0000 (16:37 -0700)]
Add persistent state for Bluetooth high quality audio support
Defines the flags used in code and the Settings.Global key names for
persisting the following state for Bluetooth A2DP Sink devices:
-Whether the device supports optional codecs or not
-Whether optional codecs should be turned on for the device
For each of these two properties we model the state in the code as
yes/no/unknown, so that we can tailor the UI and behavior
accordingly.
Bug=
37441685
Test: manually
Change-Id: I6bcd02fd7c95bef989575f3b13d4788dab61971a
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
Wei Wang [Tue, 2 May 2017 03:24:19 +0000 (20:24 -0700)]
Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.
Test: manual
Bug:
37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
Wei Wang [Wed, 3 May 2017 03:30:28 +0000 (20:30 -0700)]
Fix RttManager documation unit issue.
Bug:
35138520
Test: Build passes. Nothing else to test as this only changes javadocs.
Change-Id: Id522eba4cf8dba2be670582e7d734bd9203b2aae