OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Added dumsys activity starter" into oc-dev
Wale Ogunwale [Tue, 20 Jun 2017 23:29:56 +0000 (23:29 +0000)]
Merge "Added dumsys activity starter" into oc-dev
am: ea0de895bb

Change-Id: I7212c30b68f1dbd76b9478975da2b4232eec5ee4

7 years agoMerge "Added dumsys activity starter" into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 23:18:05 +0000 (23:18 +0000)]
Merge "Added dumsys activity starter" into oc-dev

7 years agoMerge "Retrying the remoteview application on the ui thread" into oc-dev
Selim Cinek [Tue, 20 Jun 2017 22:56:33 +0000 (22:56 +0000)]
Merge "Retrying the remoteview application on the ui thread" into oc-dev
am: 07b93779ba

Change-Id: I827a9c9d1ece9fec41200c03400bcdf88b248cce

7 years agoMerge "Removed deprecated, hidden method." into oc-dev
Felipe Leme [Tue, 20 Jun 2017 22:46:50 +0000 (22:46 +0000)]
Merge "Removed deprecated, hidden method." into oc-dev
am: 17efecf48f

Change-Id: Ic78e1312a1230ef6765551c6104b3caba8ca6a08

7 years agoMerge "[Companion] Fix notification access dialog being in new task" into oc-dev
Eugene Susla [Tue, 20 Jun 2017 22:44:46 +0000 (22:44 +0000)]
Merge "[Companion] Fix notification access dialog being in new task" into oc-dev
am: 2eacbac8c3

Change-Id: Ic1566785ba2efae73469729f70b43775af02e57c

7 years agoMerge "Retrying the remoteview application on the ui thread" into oc-dev
Selim Cinek [Tue, 20 Jun 2017 22:40:59 +0000 (22:40 +0000)]
Merge "Retrying the remoteview application on the ui thread" into oc-dev

7 years agoMerge "Add a new flag to check if provisioning is completed on ATV" into oc-dev
Sujith Ramakrishnan [Tue, 20 Jun 2017 22:36:25 +0000 (22:36 +0000)]
Merge "Add a new flag to check if provisioning is completed on ATV" into oc-dev
am: 59c6385bf9

Change-Id: I61b688030f11cbe745dadd0a541d9196eb36d21c

7 years agoMerge "Removed deprecated, hidden method." into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 22:31:17 +0000 (22:31 +0000)]
Merge "Removed deprecated, hidden method." into oc-dev

7 years agoMerge "[Companion] Fix notification access dialog being in new task" into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 22:22:54 +0000 (22:22 +0000)]
Merge "[Companion] Fix notification access dialog being in new task" into oc-dev

7 years agoMerge "Limit creating new surface for legacy apps to size changes." into oc-dev
Bryce Lee [Tue, 20 Jun 2017 22:17:39 +0000 (22:17 +0000)]
Merge "Limit creating new surface for legacy apps to size changes." into oc-dev
am: d523125679

Change-Id: I191b285ed3785f9937c91162d3aa875a285cb51a

7 years agoMerge "Add a new flag to check if provisioning is completed on ATV" into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 22:13:09 +0000 (22:13 +0000)]
Merge "Add a new flag to check if provisioning is completed on ATV" into oc-dev

7 years agoMerge "Limit creating new surface for legacy apps to size changes." into oc-dev
Bryce Lee [Tue, 20 Jun 2017 22:05:22 +0000 (22:05 +0000)]
Merge "Limit creating new surface for legacy apps to size changes." into oc-dev

7 years agoAdded dumsys activity starter
Wale Ogunwale [Tue, 20 Jun 2017 20:38:14 +0000 (13:38 -0700)]
Added dumsys activity starter

Dumps the last state of ActivityStarter to help debug ANR issue.
Also log reason for starting an activity.

Bug: 38121026
Test: adb shell dumpsys activity starter
Change-Id: Ib77ff974b1122946fac96f8835ab3fdfc732cf7b

7 years agoMerge "Disable activity leak detection by default for userdebug" into oc-dev
Mathieu Chartier [Tue, 20 Jun 2017 20:05:29 +0000 (20:05 +0000)]
Merge "Disable activity leak detection by default for userdebug" into oc-dev
am: 956ea5f09d

Change-Id: Iadacd64e92c1963b2417bad96838ba2c128ec8cb

7 years agoMerge "Fix battery percent text not updating on Font size change" into oc-dev
Evan Laird [Tue, 20 Jun 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev
am: 2ca91661f0

Change-Id: I26680deb22ded21d970cd213e20f6d96d7ae8cc3

7 years agoMerge "Disable activity leak detection by default for userdebug" into oc-dev
Mathieu Chartier [Tue, 20 Jun 2017 19:55:19 +0000 (19:55 +0000)]
Merge "Disable activity leak detection by default for userdebug" into oc-dev

7 years agoMerge "Fix battery percent text not updating on Font size change" into oc-dev
Evan Laird [Tue, 20 Jun 2017 19:49:34 +0000 (19:49 +0000)]
Merge "Fix battery percent text not updating on Font size change" into oc-dev

7 years agoRetrying the remoteview application on the ui thread
Selim Cinek [Mon, 19 Jun 2017 23:58:35 +0000 (16:58 -0700)]
Retrying the remoteview application on the ui thread

Because of various reasons, the async inflation could spuriously
fail, leading to dropped notifications.
We're now retrying them on the UI thread before we fail completely.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java
Bug: 38190555
Change-Id: I13feaeaad925b72798a22194add16528c9438412

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread" into...
Philip P. Moltmann [Tue, 20 Jun 2017 18:41:53 +0000 (18:41 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev
am: c06746ce46  -s ours

Change-Id: Ide56fc37ebe8e06c6914e8212b232876d535f716

7 years agoMerge "remove the lock-use for prunePrintService in case blocking main thread" into...
Philip P. Moltmann [Tue, 20 Jun 2017 18:28:03 +0000 (18:28 +0000)]
Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev

7 years agoMerge "Look on all displays if can't launch on a source secondary one" into oc-dev
Andrii Kulian [Tue, 20 Jun 2017 18:11:02 +0000 (18:11 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev
am: d883070267

Change-Id: I92bd1ad211fb97bf27fe34a8d1fe4c57c6c46d89

7 years agoMerge "Look on all displays if can't launch on a source secondary one" into oc-dev
Andrii Kulian [Tue, 20 Jun 2017 18:01:14 +0000 (18:01 +0000)]
Merge "Look on all displays if can't launch on a source secondary one" into oc-dev

7 years agoLimit creating new surface for legacy apps to size changes.
Bryce Lee [Tue, 20 Jun 2017 17:47:55 +0000 (10:47 -0700)]
Limit creating new surface for legacy apps to size changes.

Creating the surface for every change (such as creation and
visibility) can lead to issues swapping buffers. This
changelist limits the action to only when the size changes.

Change-Id: Ic549d244613a93a43a9f4ddf284bbfb0c13300fa
Fixes: 62801621
Test: follow repro steps in bug, verified no crash.
Test: go/wm-smoke

7 years agoMerge "Fix QS wifi accessibility announcements" into oc-dev
Jason Monk [Tue, 20 Jun 2017 17:46:52 +0000 (17:46 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev
am: accdadae9d

Change-Id: I9ffba74a945475525a60226ba4c106af9ca99579

7 years agoMerge "Fix QS wifi accessibility announcements" into oc-dev
Jason Monk [Tue, 20 Jun 2017 17:32:26 +0000 (17:32 +0000)]
Merge "Fix QS wifi accessibility announcements" into oc-dev

7 years agoRemoved deprecated, hidden method.
Felipe Leme [Tue, 20 Jun 2017 17:16:59 +0000 (10:16 -0700)]
Removed deprecated, hidden method.

Test: existing CtsAutoFillServiceTestCases pass
Bug: 37563972

Change-Id: I10c5a2b16b422694d72b3ccaf6629d50247c7f49

7 years agoFix QS wifi accessibility announcements
Jason Monk [Tue, 20 Jun 2017 17:16:05 +0000 (13:16 -0400)]
Fix QS wifi accessibility announcements

The state was being inverted in events to try to get clicks correct,
but events can occur at other times, so really we want to invert
the state between when the click happens and when the next state
change occurs. Also add a toString to fix equals checks on the content
description to make the announcements less noisy.

Test: manual
Change-Id: Ie4159664e9a81fd1719dbf7c06fba5e7b827cc6d
Fixes: 62679498

7 years agoMerge "Correct lastId on onCreate with unexpected state" into oc-dev
Philip P. Moltmann [Tue, 20 Jun 2017 15:48:50 +0000 (15:48 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev
am: aed0c10d52

Change-Id: I821aba22236152a8a0230a0db7a3710ad7731d12

7 years agoMerge "Correct lastId on onCreate with unexpected state" into oc-dev
Philip P. Moltmann [Tue, 20 Jun 2017 15:42:13 +0000 (15:42 +0000)]
Merge "Correct lastId on onCreate with unexpected state" into oc-dev

7 years agoMerge "Remove unused a.t.InstrumentationCoreTestRunner" am: 1bfccadc81
Paul Duffin [Tue, 20 Jun 2017 15:05:46 +0000 (15:05 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner" am: 1bfccadc81
am: dfc6939ed5

Change-Id: I5ccdb58bbcde73a33bdce9b65d95aad2bf7b931f

7 years agoMerge "Track TimeZoneDistroInstaller method changes" am: ba6b96d978
Neil Fuller [Tue, 20 Jun 2017 15:02:37 +0000 (15:02 +0000)]
Merge "Track TimeZoneDistroInstaller method changes" am: ba6b96d978
am: 7ab9d93fa4

Change-Id: I0388475b92a6b4f981d5027992af461f48181ab2

7 years agoMerge "Remove unused a.t.InstrumentationCoreTestRunner"
Paul Duffin [Tue, 20 Jun 2017 14:54:46 +0000 (14:54 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner"
am: 1bfccadc81

Change-Id: Id624c17f7d5da6fa81cfac9a21726042b793c270

7 years agoMerge "Remove unused a.t.InstrumentationCoreTestRunner"
Treehugger Robot [Tue, 20 Jun 2017 14:44:57 +0000 (14:44 +0000)]
Merge "Remove unused a.t.InstrumentationCoreTestRunner"

7 years agoRemove unused a.t.InstrumentationCoreTestRunner
Paul Duffin [Tue, 20 Jun 2017 10:05:25 +0000 (11:05 +0100)]
Remove unused a.t.InstrumentationCoreTestRunner

The only usage of this was in the unused
cts/tests/vm-tests-tf/AndroidManifest.xml which was deleted in
https://android-review.googlesource.com/#/c/418900/.

Bug: 30188076
Test: make checkbuild
Change-Id: I96f3586a7017f4cd14fa31207e0fff19c92f0de4

7 years agoresolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp
Erik Kline [Tue, 20 Jun 2017 12:18:31 +0000 (21:18 +0900)]
resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3

7 years agoMerge "Track TimeZoneDistroInstaller method changes"
Neil Fuller [Tue, 20 Jun 2017 12:12:11 +0000 (12:12 +0000)]
Merge "Track TimeZoneDistroInstaller method changes"
am: ba6b96d978

Change-Id: I9352872ceb2d11739a4372589f69bb473f3457d3

7 years agoMerge "Track TimeZoneDistroInstaller method changes"
Treehugger Robot [Tue, 20 Jun 2017 12:06:29 +0000 (12:06 +0000)]
Merge "Track TimeZoneDistroInstaller method changes"

7 years agoMerge "Create a TetherInterfaceStateMachine when told the interface name."
Erik Kline [Tue, 20 Jun 2017 11:12:00 +0000 (11:12 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name."
am: 51ee00785c

Change-Id: If79a096375e6b9665d5ba4aa0bcd9dbec6a8adab

7 years agoMerge "Create a TetherInterfaceStateMachine when told the interface name."
Erik Kline [Tue, 20 Jun 2017 11:01:13 +0000 (11:01 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name."

7 years agoCreate a TetherInterfaceStateMachine when told the interface name.
Erik Kline [Tue, 20 Jun 2017 08:18:27 +0000 (17:18 +0900)]
Create a TetherInterfaceStateMachine when told the interface name.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Bug: 62343300

Change-Id: I93f3bdcf20dc4f03cd621d7ab6066344642550e3

7 years agoresolve merge conflicts of 48bc4c1f420d to stage-aosp-master
Hugo Benichi [Tue, 20 Jun 2017 07:18:25 +0000 (07:18 +0000)]
resolve merge conflicts of 48bc4c1f420d to stage-aosp-master
am: ca0c91b9f1

Change-Id: I941327a914d4a44e63a5f57fc0aa98d778fef949

7 years agoresolve merge conflicts of 48bc4c1f420d to stage-aosp-master
Hugo Benichi [Tue, 20 Jun 2017 07:02:33 +0000 (16:02 +0900)]
resolve merge conflicts of 48bc4c1f420d to stage-aosp-master

Change-Id: I41889b0497463e8a63cf2d1e983e7e54298c5c2e

7 years agoMerge "Better errors from unregisterNetworkCallback" am: 04e89ad631
Hugo Benichi [Tue, 20 Jun 2017 05:19:46 +0000 (05:19 +0000)]
Merge "Better errors from unregisterNetworkCallback" am: 04e89ad631
am: ca6ebb0f39

Change-Id: Ib380ee7c3fc85db353682ee7abfe97842eaeeb29

7 years agoMerge "Better errors from unregisterNetworkCallback"
Hugo Benichi [Tue, 20 Jun 2017 05:12:39 +0000 (05:12 +0000)]
Merge "Better errors from unregisterNetworkCallback"
am: 04e89ad631

Change-Id: Icbd68ff14db55c6546c7de6353774a3622b32f9e

7 years agoMerge "CaptivePortalLogin correctly unregisters callbacks"
Hugo Benichi [Tue, 20 Jun 2017 05:04:01 +0000 (05:04 +0000)]
Merge "CaptivePortalLogin correctly unregisters callbacks"

7 years agoMerge "Better errors from unregisterNetworkCallback"
Hugo Benichi [Tue, 20 Jun 2017 05:03:22 +0000 (05:03 +0000)]
Merge "Better errors from unregisterNetworkCallback"

7 years agoMerge "DO NOT MERGE Instrument captive portal login activity" am: 778ade9073 -s...
Hugo Benichi [Tue, 20 Jun 2017 04:49:06 +0000 (04:49 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity" am: 778ade9073  -s ours
am: 5da98a422d  -s ours

Change-Id: Iffdc9cae102d54672d55274a8cad582b3b6d5f6a

7 years agoMerge "Hack around b/36066697." into oc-dev
Josh Gao [Tue, 20 Jun 2017 04:31:40 +0000 (04:31 +0000)]
Merge "Hack around b/36066697." into oc-dev
am: e139434e3a

Change-Id: I97427d86074cea38ca6aa59264e98a5d81645830

7 years agoMerge "Hack around b/36066697." into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 04:24:08 +0000 (04:24 +0000)]
Merge "Hack around b/36066697." into oc-dev

7 years agoDisable activity leak detection by default for userdebug
Mathieu Chartier [Tue, 20 Jun 2017 01:42:57 +0000 (18:42 -0700)]
Disable activity leak detection by default for userdebug

Causes too many GCs and related slowdowns.
Verified that assistant launch from holding down home button is now
faster than N.

Test: make and flash
Bug: 62769566

Change-Id: Ib0c1f7a45831b241d3376d1e56db3c6937913b1b

7 years agoMerge "Remove legacy advertiser from map after it's no longer used" into oc-dev
Jakub Pawlowski [Tue, 20 Jun 2017 01:46:56 +0000 (01:46 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
am: 271e0aa02a

Change-Id: Idddaa69cc89caaebcee0be1d4d27e28e2fd8ea51

7 years agoMerge "Remove legacy advertiser from map after it's no longer used" into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 01:38:36 +0000 (01:38 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev

7 years agoMerge "Fix potential race in Theme creation" into oc-dev
Adam Lesinski [Tue, 20 Jun 2017 01:11:20 +0000 (01:11 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev
am: b0a5fd0384

Change-Id: I9044d46d68f7fcb471f584d75225137c3b6f171b

7 years agoMerge "Fix potential race in Theme creation" into oc-dev
Adam Lesinski [Tue, 20 Jun 2017 01:07:06 +0000 (01:07 +0000)]
Merge "Fix potential race in Theme creation" into oc-dev

7 years agoMerge "DO NOT MERGE Instrument captive portal login activity"
Hugo Benichi [Tue, 20 Jun 2017 00:54:48 +0000 (00:54 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity"
am: 778ade9073  -s ours

Change-Id: Ie493a705d3c60958037b0128195ee4ac85329d8b

7 years ago[Companion] Fix notification access dialog being in new task
Eugene Susla [Tue, 20 Jun 2017 00:27:23 +0000 (17:27 -0700)]
[Companion] Fix notification access dialog being in new task

Fixes: 62678460
Test: Tap recents while the dialog is shown and ensure it's not in a
separate task
Change-Id: I0572ddc84d76643ac8a373939273c221ff20676f

7 years agoMerge "DO NOT MERGE Instrument captive portal login activity"
Hugo Benichi [Tue, 20 Jun 2017 00:47:55 +0000 (00:47 +0000)]
Merge "DO NOT MERGE Instrument captive portal login activity"

7 years agoMerge "Fixed updateAutofillValue() when mText is not set." into oc-dev
Felipe Leme [Tue, 20 Jun 2017 00:34:31 +0000 (00:34 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev
am: 4eaba84065

Change-Id: Ia00eb87f13de85ee652aa5cbab290dd98d817399

7 years agoMerge "Fixed updateAutofillValue() when mText is not set." into oc-dev
TreeHugger Robot [Tue, 20 Jun 2017 00:27:32 +0000 (00:27 +0000)]
Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev

7 years agoMerge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev
Dianne Hackborn [Tue, 20 Jun 2017 00:03:20 +0000 (00:03 +0000)]
Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev
am: fa791d5e97

Change-Id: Ib6d3357df726979e94a6e04a61c4152b91429f6c

7 years agoMerge "Revive DeadZone" into oc-dev
Siarhei Vishniakou [Mon, 19 Jun 2017 23:58:04 +0000 (23:58 +0000)]
Merge "Revive DeadZone" into oc-dev
am: b278424fa6

Change-Id: Ib4388b31d3b636826c428a89389585ae5b9cb25e

7 years agoCorrect lastId on onCreate with unexpected state
Philip P. Moltmann [Mon, 19 Jun 2017 19:57:13 +0000 (12:57 -0700)]
Correct lastId on onCreate with unexpected state

onCreate might be called with a state not produced by
onSaveInstanceState. In this case the last autofill ID is not set, so we
incorrectly restore it to NO_ID instead of LAST_APP_AUTOFILL_ID

Change-Id: Id40c06bf223c0e3c6235b2d50779e3f4532898b5
Fixes: 62296699
Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
(cherry picked from commit 1266d08be53c6ee2494d18363092c68825ef449e)

7 years agoMerge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 23:50:23 +0000 (23:50 +0000)]
Merge "Fix issue #62787070: restart due to NPE in JobServiceContext..." into oc-dev

7 years agoMerge "Revive DeadZone" into oc-dev
Siarhei Vishniakou [Mon, 19 Jun 2017 23:47:48 +0000 (23:47 +0000)]
Merge "Revive DeadZone" into oc-dev

7 years agoMerge "Make --no-window-animation flag apply to animators, too" into oc-dev
Chet Haase [Mon, 19 Jun 2017 23:39:54 +0000 (23:39 +0000)]
Merge "Make --no-window-animation flag apply to animators, too" into oc-dev
am: c36e3e7fff

Change-Id: I8c16496b18d5aca4c570e45a000081790c16ac78

7 years agoRemove legacy advertiser from map after it's no longer used
Jakub Pawlowski [Wed, 14 Jun 2017 01:59:07 +0000 (18:59 -0700)]
Remove legacy advertiser from map after it's no longer used

Test: manual
Bug: 62597369
Change-Id: Ief1e1b054f29b59b1ed72514b138d4f209f9847a

7 years agoMerge "Added back removed ctor from DisplayEventReceiver" into oc-dev
Wale Ogunwale [Mon, 19 Jun 2017 23:29:53 +0000 (23:29 +0000)]
Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev
am: 113918f309

Change-Id: Iab45bb64e04cbddde6cd627763aab19b663aa919

7 years agoMerge "Make --no-window-animation flag apply to animators, too" into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 23:29:04 +0000 (23:29 +0000)]
Merge "Make --no-window-animation flag apply to animators, too" into oc-dev

7 years agoMerge "Added back removed ctor from DisplayEventReceiver" into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 23:16:14 +0000 (23:16 +0000)]
Merge "Added back removed ctor from DisplayEventReceiver" into oc-dev

7 years agoremove the lock-use for prunePrintService in case blocking main thread
yangbingqian [Mon, 12 Jun 2017 14:45:50 +0000 (22:45 +0800)]
remove the lock-use for prunePrintService in case blocking main thread

As in the change: I4f4cdaba65132dc2ef054877cbb097b499a723f6
the lock object is removed when calling RemotePrintSpooler
and so as it in the method prunePrintService(). But in the
constructor of UserState, the mLock is still held when calling
prunePrintService(), it may also block the main thread

It is better to take it out of the synchronized block

Test: null
Fixes: 37481484

Change-Id: I21fe5380d5c6302f70e04eee7dac0050886ed4f0
Merged-In: I709b491d611dbcbf21a5fd493b879ed290dd0247
Signed-off-by: yangbingqian <yangbingqian@xiaomi.com>
7 years agoFix potential race in Theme creation
Adam Lesinski [Mon, 12 Jun 2017 19:22:10 +0000 (12:22 -0700)]
Fix potential race in Theme creation

Bug: 38190555
Test: none
Change-Id: Id627bd6088dc469baffb1abb8310cd9e992996aa

7 years agoMerge "Add an extra level of indirection to make sure that native IHwBinder" am:...
Andreas Huber [Mon, 19 Jun 2017 22:19:55 +0000 (22:19 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" am: b6dde12ef0
am: e7191f50b5

Change-Id: If9c376697a638523f6b691fa37d9cfb73fc8e20d

7 years agoMerge "Add an extra level of indirection to make sure that native IHwBinder"
Andreas Huber [Mon, 19 Jun 2017 22:07:45 +0000 (22:07 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder"
am: b6dde12ef0

Change-Id: I342d0d1a09ed1677b7619df7df033471b48c937a

7 years agoMerge "[Companion] Fix NPE in associate" into oc-dev
Eugene Susla [Mon, 19 Jun 2017 22:02:13 +0000 (22:02 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev
am: ba003a97f8

Change-Id: I690b6d88bcce507d7fbae855cd9939616ac86212

7 years agoMerge "Add an extra level of indirection to make sure that native IHwBinder"
Treehugger Robot [Mon, 19 Jun 2017 21:55:04 +0000 (21:55 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder"

7 years agoMerge "[Companion] Fix NPE in associate" into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 21:52:14 +0000 (21:52 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev

7 years agoLook on all displays if can't launch on a source secondary one
Andrii Kulian [Fri, 16 Jun 2017 22:29:26 +0000 (15:29 -0700)]
Look on all displays if can't launch on a source secondary one

If an activity is launched from a secondary display but is not
allowed to land on it, then look for a topmost valid launch stack
across all displays.

Bug: 62544886
Test: go/wm-smoke
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testLaunchNonResizeableActivityFromSecondaryDisplaySameTask
Test: #testLaunchNonResizeableActivityFromSecondaryDisplayNewTask
Change-Id: I57470e9ede317f7d492e2b7641a5cb02db13f1b0

7 years agoFix issue #62787070: restart due to NPE in JobServiceContext...
Dianne Hackborn [Mon, 19 Jun 2017 21:24:51 +0000 (14:24 -0700)]
Fix issue #62787070: restart due to NPE in JobServiceContext...

...handleOpTimeoutLocked

Don't try to print the running job if it is null.

Also, the timeout message should be scheduled with the actually
running job it is for, so we can ignore it if we happen to
dispatch one after the job is over.

Test: bit CtsJobSchedulerTestCases:*

Change-Id: I7bc55f55da645a9e116d3f0ee02f2ee115383ea9

7 years agoMerge "Do not update currently open tooltip." into oc-dev
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:12:41 +0000 (21:12 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia0b5b2c7ee9dc8a0cc975562de350ac0ff4a0449

7 years agoHack around b/36066697.
Josh Gao [Mon, 19 Jun 2017 20:38:20 +0000 (13:38 -0700)]
Hack around b/36066697.

Avoid calling libbinder's static destructors by calling _exit instead
of returning in main.

Bug: http://b/36066697
Test: treehugger
Change-Id: I81dd50453f1ea64d97ec97d207fff732b3c62512

7 years agoRevive DeadZone
Siarhei Vishniakou [Sat, 3 Jun 2017 00:20:34 +0000 (17:20 -0700)]
Revive DeadZone

Override dispatchTouchEvent for the root FrameLayout
of NavigationBar to process ACTION_OUTSIDE MotionEvents
and dispatch directly to DeadZone to keep track of the
most recent outside tap.
Clarified documentation of ACTION_OUTSIDE behaviour.

Bug: 37552674
Test: open IME, tap any key, then quickly tap on top half
of the home button. The home button tap is ignored
and device does not go to homescreen.

Change-Id: Icb5cf6c76959f3514b8b94c09e38cc5434f31b23

7 years agoMerge "Do not update currently open tooltip." into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 21:01:42 +0000 (21:01 +0000)]
Merge "Do not update currently open tooltip." into oc-dev

7 years agoAdded back removed ctor from DisplayEventReceiver
Wale Ogunwale [Mon, 19 Jun 2017 20:53:32 +0000 (13:53 -0700)]
Added back removed ctor from DisplayEventReceiver

...because some app can't help but access hidden APIs...

Test: builds
Change-Id: Ia1d4a71b46a53b44e3ebe5844e446009785a90ac
Fixes: 62719884

7 years agoMerge "Reduce no-op notification log messages." into oc-dev
Dan Sandler [Mon, 19 Jun 2017 20:45:20 +0000 (20:45 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev
am: 5e3fb57af8

Change-Id: I6835b0804b66ad0ee0ff682b29a728f3cceca0bf

7 years agoMerge "Reduce no-op notification log messages." into oc-dev
TreeHugger Robot [Mon, 19 Jun 2017 20:32:13 +0000 (20:32 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev

7 years agoMerge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96
Hall Liu [Mon, 19 Jun 2017 20:16:07 +0000 (20:16 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96
am: d974296f8c

Change-Id: I61d4f04ec27b0298c9ab77dd92bf14d44a1ed93f

7 years agoMerge changes from topics 'embms-init-fix', 'embms-download-2'
Hall Liu [Mon, 19 Jun 2017 20:03:42 +0000 (20:03 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2'
am: e601160a96

Change-Id: Icb84816dc98198ad6ed85dd8b030fbd0198d73a4

7 years agoMerge changes from topics 'embms-init-fix', 'embms-download-2'
Hall Liu [Mon, 19 Jun 2017 19:53:40 +0000 (19:53 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2'

* changes:
  Add callback for initialization done
  Embms download part 2

7 years agoMerge "Remove legacy advertiser from map after it's no longer used" am: 42b1578867
Jakub Pawlowski [Mon, 19 Jun 2017 19:40:38 +0000 (19:40 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" am: 42b1578867
am: de1f0d7607

Change-Id: I89b5be7443dff10a3a52a0b6dbee76a5d34b8173

7 years agoMerge "Remove legacy advertiser from map after it's no longer used"
Jakub Pawlowski [Mon, 19 Jun 2017 19:26:32 +0000 (19:26 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used"
am: 42b1578867

Change-Id: I8f6f49f0d75c840faa8a7dbdb56a1debecd28d97

7 years agoMerge "Remove legacy advertiser from map after it's no longer used"
Treehugger Robot [Mon, 19 Jun 2017 19:17:38 +0000 (19:17 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used"

7 years agoFixed updateAutofillValue() when mText is not set.
Felipe Leme [Mon, 19 Jun 2017 16:45:48 +0000 (09:45 -0700)]
Fixed updateAutofillValue() when mText is not set.

updateAutofillValue() was crashing some apps when the mText was not set at the
time it was called. One solution would be to not set mText at all - since the
Autofill Service should rely only on getAutofillValue() - but that could break
existing services.

Hence, a safer solution is to set that field if it's null.

Test: existing CtsAutoFillServiceTestCases tests pass
Test: manual verification using Fly Delta app

Fixes: 62751039

Change-Id: I91a8e0ed5db4148f5eb5729b8e254aa3531f15e4

7 years agoAdd an extra level of indirection to make sure that native IHwBinder
Andreas Huber [Fri, 16 Jun 2017 21:56:12 +0000 (14:56 -0700)]
Add an extra level of indirection to make sure that native IHwBinder

objects, while alive, maintain a strong reference to their Java
counterpart.

Bug: 33042939
Test: hidl_test_java
Change-Id: I69179772b3218705e9ef46cbb10b21b6473280d6

7 years agoRemove legacy advertiser from map after it's no longer used
Jakub Pawlowski [Wed, 14 Jun 2017 01:59:07 +0000 (18:59 -0700)]
Remove legacy advertiser from map after it's no longer used

Test: manual
Bug: 62597369
Change-Id: Ief1e1b054f29b59b1ed72514b138d4f209f9847a

7 years agoTrack TimeZoneDistroInstaller method changes
Neil Fuller [Mon, 19 Jun 2017 11:56:08 +0000 (12:56 +0100)]
Track TimeZoneDistroInstaller method changes

The TimeZoneDistroInstaller now takes a TimeZoneDistro object
not bytes, which will help to hide whether the distro is in memory
or in storage. See the associated libcore change for details.

To run tests:
make -j30 FrameworksServicesTests
adb install -r -g
  "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w
  com.android.frameworks.servicestests \
  "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Bug: 31008728

Change-Id: Ieead1bb87b9ae196abab93342ba5c5747ca45116

7 years agoMerge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
Dianne Hackborn [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]
Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am: 8a95d49d8f

Change-Id: I40b069c811b9cc687265f802524b8b290cd4f269

7 years agoMerge "Fix crash during TextView.onCreateContextMenu" into oc-dev
Siyamed Sinir [Mon, 19 Jun 2017 17:05:27 +0000 (17:05 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am: 58df6ab93f

Change-Id: Ic6b3aa97edffd87e643a778d73aa61e890f52a4b

7 years agoMerge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
Dianne Hackborn [Mon, 19 Jun 2017 17:04:04 +0000 (17:04 +0000)]
Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev

7 years agoMerge "Fix crash during TextView.onCreateContextMenu" into oc-dev
Siyamed Sinir [Mon, 19 Jun 2017 16:53:11 +0000 (16:53 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev

7 years agoAdd a new flag to check if provisioning is completed on ATV
Sujith Ramakrishnan [Sat, 17 Jun 2017 01:03:18 +0000 (18:03 -0700)]
Add a new flag to check if provisioning is completed on ATV

- This flag will be set once provisioning is completed
  and reset when SetupWizard is re-enabled.

Test: None. Adding a static variable.

Bug: 62419382
Change-Id: Ie3e4c118d26f6bd035a451ed1914e73bdeda4e3f