OSDN Git Service

android-x86/frameworks-base.git
7 years agoAvoid unnecessary ULocale.addLikelySubtags()
Yohei Yukawa [Thu, 4 May 2017 23:28:18 +0000 (16:28 -0700)]
Avoid unnecessary ULocale.addLikelySubtags()

This CL gets rid of unnecessary operations from
LocaleUtils.filterByLanguage() to speed it up, especially for the case
where there is an IME that has many subtypes.

ULocale.addLikelySubtags(ULocale) is known to be slow. Given an IME
that has N IME subtypes, LocaleUtils.filterByLanguage() calls it no
less than N times even when the only one system language is selected.
This has contributed to device boot time (Bug 32343335) time and user
switching time (Bug 28750507) since Android N where IME support
started taking multi-locale into account.

With this CL, LocaleUtils.filterByLanguage() no longer calls it
for a subtype unless its language part of the locale matches one of
user-selected system locales.

The only assumption we made here is

 for any Locale objects l1 and l2
   TextUtils.equals(l1.getLanguage(), l2.getLanguage())
 and
   TextUtils.equals(ul1.getLanguage(), ul2.getLanguage())
 are equivalent, where
   ul1 = ULocale.addLikelySubtags(ULocale.forLocale(l1)) and
   ul2 = ULocale.addLikelySubtags(ULocale.forLocale(l2))

This should be reasonable assumption, at least for locales we want to
care about for IMEs. Under this assumption there is no behavior
change at all.

Test: bit FrameworksCoreTests:com.android.internal.inputmethod.LocaleUtilsTest
Bug: 37647204
Change-Id: Ic96900fcaf3db8b7046a50b3fe6ad65aceada369

7 years agoMerge "Revert "Don't add other's child as header or footer"" into oc-dev
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

7 years agoMerge "Fix potential race in DexManager" 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

7 years agoMerge "Don't copy NoCopySpans for assist and autofill" 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

7 years agoMerge "Reduce the timeout for waiting for the network state update." 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

7 years agoMerge "Avoid reading HW bitmap pixels twice" 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

7 years agoMerge "Revert "O is API 26"" into oc-dev
Ian Pedowitz [Thu, 4 May 2017 00:07:05 +0000 (00:07 +0000)]
Merge "Revert "O is API 26"" into oc-dev

7 years agoMerge "Grant ephemeral app access during service bind" 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

7 years agoMerge "Accessibility shortcut on Android TV." 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

7 years agoBluetooth: OBEX: Don't close transport when obex is disconnected
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)

7 years agoMerge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev

7 years agoMerge changes from topic 'allow_none_scorer' into oc-dev
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.

7 years agoMerge "Add network disabled reason starting index" into oc-dev
Randy Pan [Wed, 3 May 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Add network disabled reason starting index" into oc-dev

7 years agoMerge "Add compatibility matrices to VintfObject.report()" 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

7 years agoMerge "Make all FrameBuilderTests run on RT" 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

7 years agoMerge "Use timeout for *dexopt* wake lock" 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

7 years agoRevert "O is API 26"
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

7 years agoMerge "Fix Array Index out of bounds error." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 21:22:44 +0000 (21:22 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev

7 years agoMerge "Notification: Remove actions from public view" 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

7 years agoMerge "Prevent NPE in startActivityUnchecked" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev

7 years agoMerge "Send AutofillValue of Views that originated a forced request." 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

7 years agoMerge "AOD: Pass through pulse reason to DozeUi" 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

7 years agoMerge "Don't mix "current dataset" tokens for different backup transports" 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

7 years agoMerge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 19:50:53 +0000 (19:50 +0000)]
Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev

7 years agoMerge "Fix RttManager documation unit issue." 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

7 years agoRevert "Don't add other's child as header or footer"
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

7 years agoMerge "Fix QS visibility logs missing some info" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 19:04:29 +0000 (19:04 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev

7 years agoMerge "TextClassifier: Append http:// to url intents that need one." into oc-dev
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

7 years agoFix potential race in DexManager
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

7 years agoMerge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev
Narayan Kamath [Wed, 3 May 2017 18:03:03 +0000 (18:03 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev

7 years agoMerge "Only remove task if activity fails to start." 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

7 years agoMerge "Respect Z-ordering when assigning fullscreen-dim layer." 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

7 years agoMake all FrameBuilderTests run on RT
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

7 years agoAdd compatibility matrices to VintfObject.report()
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

7 years agoMerge "Fix snapshots for secure windows" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 17:29:16 +0000 (17:29 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev

7 years agoMerge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
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

7 years agoMerge "Night display status restores on reboot/user change" 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

7 years agoGrant ephemeral app access during service bind
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

7 years agoMerge "Treat apps that use channels as O apps" into oc-dev
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

7 years agoMerge "support locale change for notification channels" 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

7 years agoPrevent NPE in startActivityUnchecked
Fyodor Kupolov [Wed, 3 May 2017 16:30:19 +0000 (09:30 -0700)]
Prevent NPE in startActivityUnchecked

Test: manual
Bug: 37931794
Change-Id: I4a968e12cfa99d347f19a8cf2a3b9fba1bf1715b

7 years agoMerge "Only allow AM to update display orientation based on app containers" into...
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

7 years agoMerge "Update unit tests for forward delete" 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

7 years agoMerge "Sorting and intrusiveness updates" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 15:39:26 +0000 (15:39 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev

7 years agoFix snapshots for secure windows
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

7 years agoMerge "Add more explicit documentation for install reason" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 15:10:10 +0000 (15:10 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev

7 years agoNight display status restores on reboot/user change
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

7 years agoFix QS visibility logs missing some info
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

7 years agoTreat apps that use channels as O apps
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

7 years agoOnly allow AM to update display orientation based on app containers
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.

7 years agoMerge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
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

7 years agoSorting and intrusiveness updates
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

7 years agoMerge "DozePlugin: Remove" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 13:43:14 +0000 (13:43 +0000)]
Merge "DozePlugin: Remove" into oc-dev

7 years agoAdd more explicit documentation for install reason
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

7 years agoMerge "Fix lock contention: Call into power manager service from handler" into oc-dev
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

7 years agoMerge "Delete default channel for all apps targeting O." 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

7 years agoMerge "Avoid classifying text mulitple times." 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

7 years agoAvoid reading HW bitmap pixels twice
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

7 years agoIncrease timeout for ADB backup/restore of SharedStorage.
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

7 years agoFix lock contention: Call into power manager service from handler
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

7 years agopreloaded-classes: Add android.text.Html$HtmlParser
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

7 years agoMerge "Move text coretests to JUnit (1)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:42:01 +0000 (09:42 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev

7 years agoMerge "Move text coretests to JUnit (2)" 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

7 years agoMerge "Update frameworks/base to new compiler filters." 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

7 years agoMerge "Fix VideoView touch and trackball handlers to call super." 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

7 years agoMerge "Updating network info state should return true." into oc-dev
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev

7 years agoMerge "Fix Bluetooth GATT API default handler assignment" 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

7 years agoFix Wakelock underlock in GnssLocationProvider.
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

7 years agoFix RttManager documation unit issue.
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

7 years agoMerge "Remove snippet regarding ContentProvider#notifyChange in documentation." into...
Ben Lin [Wed, 3 May 2017 02:25:03 +0000 (02:25 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev

7 years agoNotification: Remove actions from public view
Adrian Roos [Wed, 3 May 2017 01:54:40 +0000 (18:54 -0700)]
Notification: Remove actions from public view

Change-Id: I9d95e2ea3ff89110f58f6d5585771ad301494e41
Test: Turn on "hide sensitive notifications on lockscreen", receive notification, make sure it has no actions
Fixes: 37907366

7 years agoMerge "Don't add other's child as header or footer" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:12:03 +0000 (02:12 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev

7 years agoMerge "Optionally let the instant app into disambig" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:06:29 +0000 (02:06 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev

7 years agoMerge "More work on issue #36891897: Need to ensure foreground..." into oc-dev
Dianne Hackborn [Wed, 3 May 2017 01:46:25 +0000 (01:46 +0000)]
Merge "More work on issue #36891897: Need to ensure foreground..." into oc-dev

7 years agoUpdate unit tests for forward delete
Roozbeh Pournader [Wed, 3 May 2017 01:33:12 +0000 (18:33 -0700)]
Update unit tests for forward delete

Changes in the definition of grapheme boundaries for emoji (which
now relies more on what actually ligates in a font) need updating the
unit tests. The changes in the unit tests are cases where the old
code in Minikin assumed a single grapheme, but the new code looks in
the font and finds that there are two grapheme clusters indeed.

Change-Id: Icd3d2563776fb295f48e70b67a8af8e6bd3f4b38
Fixes: 37769578
Test: updated tests pass

7 years agosupport locale change for notification channels
fionaxu [Tue, 2 May 2017 22:56:58 +0000 (15:56 -0700)]
support locale change for notification channels

Bug: 37911731
Test: Manual test with different languages
Change-Id: I36ce985dfc8fdb0f6c2b8b20c411b63099942f44

7 years agoUpdating network info state should return true.
Sundeep Ghuman [Fri, 21 Apr 2017 04:25:41 +0000 (21:25 -0700)]
Updating network info state should return true.

Update AccessPoint.java so that network state changes return updated
equals true, so that corresponding UI elements will updated
appropriately.

Bug: b/37289220
Test: runtest --path
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I1bc74997227b46468ef11efbf183a95ec0d2b15f

7 years agoFix Bluetooth GATT API default handler assignment
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment

Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.

This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.

Bug: 37544152
Bug: 37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9

7 years agoOptionally let the instant app into disambig
Todd Kennedy [Wed, 26 Apr 2017 19:58:28 +0000 (12:58 -0700)]
Optionally let the instant app into disambig

When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.

Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes: 37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app

7 years agoMerge "Update ime touch exclude region for hosting display" into oc-dev
Andrii Kulian [Wed, 3 May 2017 00:03:25 +0000 (00:03 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev

7 years agoMerge changes from topic 'frankenbuild' into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:59:46 +0000 (23:59 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev

* changes:
  Revert "Resource ID fixup."
  Resource ID fixup.

7 years agoMerge "Add more information to WTF to investigate bug 37809561" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:51:33 +0000 (23:51 +0000)]
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev

7 years agoMerge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev

7 years agoFix Array Index out of bounds error.
Sundeep Ghuman [Tue, 2 May 2017 22:58:39 +0000 (15:58 -0700)]
Fix Array Index out of bounds error.

This error was caused by concurrent modification of the
mPendingNotifications SparseIntArray which fell outside the
synchronization block in copyAndNotifyListeners. Now the entire
copyAndNotifyListeners is synchronized on mLock.

Bug: b/37775443
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I19e8a4ecea5cd45122f4ca89f8ed959e500c951a

7 years agoMerge "Restoring old methods for compatibility." into oc-dev
Winson Chung [Tue, 2 May 2017 23:19:24 +0000 (23:19 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev

7 years agoMerge "Added Channel for Network Initiated Notifications" into oc-dev
Siddharth Ray [Tue, 2 May 2017 23:13:01 +0000 (23:13 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev

7 years agoRestoring old methods for compatibility.
Winson Chung [Tue, 2 May 2017 22:14:23 +0000 (15:14 -0700)]
Restoring old methods for compatibility.

Bug: 37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c

7 years agoMerge "O is API 26" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 22:11:53 +0000 (22:11 +0000)]
Merge "O is API 26" into oc-dev

7 years agoReduce the timeout for waiting for the network state update.
Sudheer Shanka [Tue, 2 May 2017 19:31:57 +0000 (12:31 -0700)]
Reduce the timeout for waiting for the network state update.

Also add more info to wtf log.

Bug: 27803922
Test: manual
Change-Id: I746c7814a77eccc9206c36fa1fb5114a6baa3735

7 years agoUse timeout for *dexopt* wake lock
Fyodor Kupolov [Tue, 2 May 2017 19:11:02 +0000 (12:11 -0700)]
Use timeout for *dexopt* wake lock

There are reports of *dexopt* lock being held for 10+ minutes, which shouldn't
normally happen on threads that are monitored by the Watchdog. Added
logging to help detecting that.

The lock is now held with a timeout of WAKELOCK_TIMEOUT_MS. It is set to a
higher value than PM's watchdog timeout for easier reading from a timing
histogram.

Test: Manual, device boots without errors
Bug: 37756892
Change-Id: Iac569474d1c95447e08fe5e9870e4518b8d22c65

7 years agoRespect Z-ordering when assigning fullscreen-dim layer.
Robert Carr [Tue, 2 May 2017 22:00:50 +0000 (15:00 -0700)]
Respect Z-ordering when assigning fullscreen-dim layer.

As an optimization, we use a shared fullscreen dim layer for multiple
users. We need to be careful to look at the Z-order of various users
when choosing who to assign it to.

Bug: 36415615
Test: Ask assistant question, long press power, assistant should be dimmed.
Change-Id: Ifea94fe33d32236b79800c0e7c543aac52c8b69f

7 years agoSkip Pip animation to fullscreen if orientation is going to change
Wale Ogunwale [Tue, 2 May 2017 04:32:58 +0000 (21:32 -0700)]
Skip Pip animation to fullscreen if orientation is going to change

Having this kind of animation look good is extremely difficult.
The best we can do is skip the animation and just go to fullscreen
if we know the device orientation is going to change because the
current screen configuration isn't compatible with the fixed
orientation requested by the app going fullscreen.

Change-Id: I97b14723a0d678c05efedc93fe692ad3b3212a72
Fixes: 37722472
Test: manual

7 years agoMerge "Adding voicemail transcription state to the database" into oc-dev
Michael Dooley [Tue, 2 May 2017 22:01:12 +0000 (22:01 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev

7 years agoOnly remove task if activity fails to start.
Winson Chung [Tue, 2 May 2017 21:40:33 +0000 (14:40 -0700)]
Only remove task if activity fails to start.

Bug: 37501224
Test: Start activity, go home, start activity again
Change-Id: Ic10183ad1af2e588ad342b0fd8ea4ad0b45adf1d

7 years agoTextClassifier: Append http:// to url intents that need one.
Abodunrinwa Toki [Tue, 2 May 2017 20:43:41 +0000 (21:43 +0100)]
TextClassifier: Append  to url intents that need one.

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 36504599
Change-Id: I5008225a6a3df2d8e07e4a9ae0e340a6582f9e7b

7 years agoUpdate ime touch exclude region for hosting display
Andrii Kulian [Tue, 2 May 2017 20:22:42 +0000 (13:22 -0700)]
Update ime touch exclude region for hosting display

If IME for an application is situated on a different display,
then we need to update corresponding display content's touch
exclude region.

Bug: 36515606
Test: Manual, b/37911363
Change-Id: I43785de6f26adf88e9a76b9144b39f66f232a646

7 years agoSend AutofillValue of Views that originated a forced request.
Felipe Leme [Tue, 2 May 2017 20:53:15 +0000 (13:53 -0700)]
Send AutofillValue of Views that originated a forced request.

Bug: 36034784
Test: CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.testAutofillManuallyPartialField()

Change-Id: I79970f236f0ae3caaff60acc19ab8a08c3cb2ef4

7 years agoMerge "Don't focus search user-specified views which are invisible" into oc-dev
Evan Rosky [Tue, 2 May 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev

7 years agoAdded Channel for Network Initiated Notifications
Siddharth Ray [Mon, 1 May 2017 20:29:04 +0000 (13:29 -0700)]
Added Channel for Network Initiated Notifications

Bug=37659896

Change-Id: I1c04a9455c320330efbcb92c352fc31b16ed8378

7 years agoRevert "Resource ID fixup."
Michael Wright [Tue, 2 May 2017 20:35:28 +0000 (21:35 +0100)]
Revert "Resource ID fixup."

This reverts commit e6d161554f4cb84a6a5410b2b7e9ed5348bdf96d.

Bug: 37480230
Test: build
Change-Id: I2322c34132c5c8761d7506b00b2a8cdd286a5e48