OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Log the "change selected text" gesture." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 16:50:15 +0000 (16:50 +0000)]
Merge "Log the "change selected text" gesture." into oc-mr1-dev

6 years agoMerge "Update crash dialog icons to rounded versions" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 15:49:52 +0000 (15:49 +0000)]
Merge "Update crash dialog icons to rounded versions" into oc-mr1-dev

6 years agoMerge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev
Bryce Lee [Tue, 12 Sep 2017 14:20:50 +0000 (14:20 +0000)]
Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev

6 years agoLog the "change selected text" gesture.
Abodunrinwa Toki [Wed, 6 Sep 2017 21:05:18 +0000 (22:05 +0100)]
Log the "change selected text" gesture.

This logs when the selected text is changed e.g. by typing on
the hard or soft keyboard.

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Merged-In: I82b3b2157856c607d08a82c0a3d9fb938af4c06a
Change-Id: I82b3b2157856c607d08a82c0a3d9fb938af4c06a

6 years agoMerge "Fix smart selection logging bugs." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 12:39:42 +0000 (12:39 +0000)]
Merge "Fix smart selection logging bugs." into oc-mr1-dev

6 years agoMerge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 12:29:46 +0000 (12:29 +0000)]
Merge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev

6 years agoMerge "Remove unused global references in JNI code supporting HwBinder." into oc...
TreeHugger Robot [Tue, 12 Sep 2017 10:26:40 +0000 (10:26 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev

6 years agoMerge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 07:36:24 +0000 (07:36 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev

6 years agoMerge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 07:26:35 +0000 (07:26 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev

6 years agoMerge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 03:00:38 +0000 (03:00 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82 am: 7359d93942  -s ours am: b2ba32be69  -s ours
am: 121df5bc6d  -s ours

Change-Id: I065099fb086c91124e7076a0d9df5782547cb1f3

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 01:19:26 +0000 (01:19 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82 am: 7359d93942  -s ours
am: b2ba32be69  -s ours

Change-Id: I20a77b0ed8af5570b899080b80655e965ecc0502

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:45:19 +0000 (00:45 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82
am: 7359d93942  -s ours

Change-Id: I87dd0675b05119a349887e534ec639fc798709e3

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:38:21 +0000 (00:38 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242
am: 4d91e69c82

Change-Id: Ie45e4da6e29b61481d6d43cc24530e5e0db7fa15

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:31:18 +0000 (00:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74
am: 5288fcc242

Change-Id: If564d9a1c4feb66163994ffb51233ce589df2465

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:23:53 +0000 (00:23 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e
am: 954b6e9b74

Change-Id: Ic5a041376b5f921b68f85c397b9b56440d11697c

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:16:19 +0000 (00:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be
am: 8393b54d3e

Change-Id: If5b7319d2514ce67467d6092c99a4661155938e0

6 years agoMerge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 00:15:17 +0000 (00:15 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:09:18 +0000 (00:09 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635
am: 064bfd22be

Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498
am: 6352ced635

Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:...
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6
am: 028ad8d498

Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34

6 years agoMerge "Fixed keyguard inflation problem" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 23:43:51 +0000 (23:43 +0000)]
Merge "Fixed keyguard inflation problem" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am: 06183a57a6

Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev

6 years agoFix smart selection logging bugs.
Abodunrinwa Toki [Fri, 8 Sep 2017 20:11:49 +0000 (21:11 +0100)]
Fix smart selection logging bugs.

- Fix count with selection start index inside a word
- Properly handle whitespace characters
- Set the model version tag

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: Manually tested that logs are correct. Will follow up with automated tests.
Merged-In: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29
Change-Id: Ib73b52ebce999f2cb6e5734e556cd09e47c89a29

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a4...
Siyamed Sinir [Mon, 11 Sep 2017 23:18:51 +0000 (23:18 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c
am: 491aaaae43

Change-Id: I5aeedb12ac229181ea5f4b2343acf81e5778494f

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into oc-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:06:27 +0000 (23:06 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
am: 846a46043c

Change-Id: I00fa802fca31e973609932fcadf49b8889f1bf00

6 years agoMerge "Add some extra zygote preloads" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Add some extra zygote preloads" into oc-mr1-dev

6 years agoMerge "Prevent getting data from Clipboard if device is locked" into oc-dev
Siyamed Sinir [Mon, 11 Sep 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev

6 years agoRemove unused global references in JNI code supporting HwBinder.
Andreas Huber [Wed, 16 Aug 2017 16:02:02 +0000 (09:02 -0700)]
Remove unused global references in JNI code supporting HwBinder.

Bug: 63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java

6 years agoMake sure top activity is stopped on sleep if paused.
Bryce Lee [Mon, 11 Sep 2017 17:44:35 +0000 (10:44 -0700)]
Make sure top activity is stopped on sleep if paused.

Currently we have logic in place to handle moving a top resumed
activity to paused and eventually stopped if entering sleep. However,
we do not handle the case when the top activity is already paused.

This changelist addresses this issue by identifying this condition
and moving the activity to the stopped state.

Change-Id: Ib9fff1efeb33719d008508cf21a17b95fc17efd0
Fixes: 65457314
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testExternalDisplayActivityTurnPrimaryOff

6 years agoMerge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
Kevin Chyn [Mon, 11 Sep 2017 21:33:32 +0000 (21:33 +0000)]
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev

6 years agoFixed keyguard inflation problem
Lucas Dupin [Mon, 11 Sep 2017 19:28:03 +0000 (12:28 -0700)]
Fixed keyguard inflation problem

Inflating a keyguard while dettached from window would
raise a NullPointerException since window insets wouldn't
be available at the time.

Test: packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Change-Id: I7f48a62807877537814e6f34db1e6fa6fbec7923
Fixes: 65495303

6 years agoMerge "Fix flicker from multiwindow resize" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 21:19:41 +0000 (21:19 +0000)]
Merge "Fix flicker from multiwindow resize" into oc-mr1-dev

6 years agoRemove broken secondary dexopt during OTA
Shubham Ajmera [Fri, 8 Sep 2017 00:55:22 +0000 (17:55 -0700)]
Remove broken secondary dexopt during OTA

This is interim until the selinux policies get fixed.

Bug: 65067046
Test: make
(cherry-picked from commit b6156ca0f53d933b427d30e69aa2f638d4ecb88f)
Change-Id: Iea69e987ae451c80fa67065e08939e389efd2814

6 years agoHandle '&' in DexoptUtils#encodeClassLoader
Shubham Ajmera [Tue, 5 Sep 2017 17:20:41 +0000 (10:20 -0700)]
Handle '&' in DexoptUtils#encodeClassLoader

For system apps, we pass '&' for CLC.
The method was treating this as a path as a result we were getting
wrong encoding for CLC.
This was causing dexopt failures for A/B OTA.

Removed the secondary dex file dexopt till we fixed it.

Bug: 65067046
Test: runtest.py -x \
  frameworks/base/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
(cherry-picked from commit 557c054935c0864b42ce49541d12d32ae6a797bc)
Change-Id: I9aa440750c811676c86d8c6d0d451077d0edf5a0

6 years agoMerge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev
Evan Rosky [Mon, 11 Sep 2017 20:25:50 +0000 (20:25 +0000)]
Merge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev

6 years agoMerge "Fixed an issue where a notification could flicker" into oc-mr1-dev
Selim Cinek [Mon, 11 Sep 2017 19:58:17 +0000 (19:58 +0000)]
Merge "Fixed an issue where a notification could flicker" into oc-mr1-dev

6 years agoMerge "Check mKeyguardUserSwitcher for null" into oc-mr1-dev
Zhi An Ng [Mon, 11 Sep 2017 19:32:10 +0000 (19:32 +0000)]
Merge "Check mKeyguardUserSwitcher for null" into oc-mr1-dev

6 years agoMerge "Fixed a bug where parts weren't scrollable" into oc-mr1-dev
Selim Cinek [Mon, 11 Sep 2017 19:03:28 +0000 (19:03 +0000)]
Merge "Fixed a bug where parts weren't scrollable" into oc-mr1-dev

6 years agoAdd some extra zygote preloads
Mathieu Chartier [Sat, 9 Sep 2017 22:19:46 +0000 (15:19 -0700)]
Add some extra zygote preloads

Slow to initialize classes used by camera, instagram, facebook,
etc.

Obtained by go/ag/2877672 and looking at logcat during application
startup for: Camera, Instagram, Maps, and Facebook.

Test: build and flash
Bug: 65493113

Merged-In: Ic7a5641560e3b7de6f4db14f452d567104ce315c

(cherry picked from commit e4e553dab5e76b6f5aefcd274dfde98103e5004a)

Change-Id: Ie7837df6310496a3d840475aa7aa0ccba876efef

6 years agoMerge "Update UnlockMethodCache when keyguard visibility changes" into oc-mr1-dev
Kevin Chyn [Mon, 11 Sep 2017 18:53:52 +0000 (18:53 +0000)]
Merge "Update UnlockMethodCache when keyguard visibility changes" into oc-mr1-dev

6 years agoMerge "Fix nav bar color while QS customizing." into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 18:52:49 +0000 (18:52 +0000)]
Merge "Fix nav bar color while QS customizing." into oc-mr1-dev

6 years agoAllow FP authentication while screensaver (not AOD) is on
Kevin Chyn [Fri, 8 Sep 2017 02:55:38 +0000 (19:55 -0700)]
Allow FP authentication while screensaver (not AOD) is on

FP authentication should be allowed whenever the screen saver is showing,
even if the device is not locked yet.

Fixes: 64537131

Test: 1) Disable AOD
2) Manually start screen saver from Settings
3) Before device is locked, touch FPS, device unlocks and wakes

Test: Do the same as the first test, but wait for the device to be locked
before touching FPS. Device unlocks and wakes

Test: Do the first two tests again with AOD enabled

Change-Id: Icd93a2e73d581e61b1c158b16de243722bd5680c

6 years agoMerge "Fix broken window flag" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 18:31:47 +0000 (18:31 +0000)]
Merge "Fix broken window flag" into oc-mr1-dev

6 years agoMerge "Fix showing views after failed transition to translucent window." into oc...
TreeHugger Robot [Mon, 11 Sep 2017 17:25:33 +0000 (17:25 +0000)]
Merge "Fix showing views after failed transition to translucent window." into oc-mr1-dev

6 years agoMerge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev
Bryce Lee [Mon, 11 Sep 2017 17:10:28 +0000 (17:10 +0000)]
Merge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev

6 years agoMerge "also verify existence of a package" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 16:47:57 +0000 (16:47 +0000)]
Merge "also verify existence of a package" into oc-mr1-dev

6 years agoCheck mKeyguardUserSwitcher for null
Ng Zhi An [Fri, 8 Sep 2017 17:41:09 +0000 (10:41 -0700)]
Check mKeyguardUserSwitcher for null

Bug: 65397789
Change-Id: Iaae968fae65182681492f635e9b09a4d15dcf897
Fixes: 65397789
Test: manual

6 years agoMerge "Don't install package if it's required to be known" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 16:39:42 +0000 (16:39 +0000)]
Merge "Don't install package if it's required to be known" into oc-mr1-dev

6 years agoRevert "Make sure top activity is stopped on sleep if paused."
Bryce Lee [Mon, 11 Sep 2017 16:31:15 +0000 (16:31 +0000)]
Revert "Make sure top activity is stopped on sleep if paused."

This reverts commit 01cffc296b1c40c3fbc7533c9ef885807a8dbc6c.

Reason for revert: causing b/65498626

Bug: 65457314
Fixes: 65498626
Change-Id: I47ddfcccaf94ceadf2104973402b3cdc50876a36

6 years agoMerge "Fix intermittent build failures with droiddoc generated sources" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 16:13:40 +0000 (16:13 +0000)]
Merge "Fix intermittent build failures with droiddoc generated sources" into oc-mr1-dev

6 years agoFix broken window flag
Jason Monk [Mon, 11 Sep 2017 15:54:12 +0000 (08:54 -0700)]
Fix broken window flag

It got lost in reverts and un-reverts.

Test: open settings
Change-Id: I243209a8d2b63ef57829abfdd3f14c00dfdf25ea
Fixes: 65495538

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357...
Tony Mak [Mon, 11 Sep 2017 15:05:34 +0000 (15:05 +0000)]
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a  -s ours am: 9c358ccbe2  -s ours
am: 72bbe1d631  -s ours

Change-Id: I85f10646a50af78fdeb8f80411350ecaec06ac40

6 years agoFix light status bar when transitioning home -> recents
Jorim Jaggi [Mon, 11 Sep 2017 14:58:53 +0000 (16:58 +0200)]
Fix light status bar when transitioning home -> recents

In the home -> recents animation home is exiting but recents
is still translucent because this is how the animation is
designed. In that case, mWinAnimator.mShownAlpha is 0 such that
mTopFullscreenOpaque becomes null, creating a flicker if both
home and recents have light status bar flag set.

We fix this by refining this condition: It was added such that
a starting window for an activity that might never become visible
does not affect the systemUI flags. Now, we only avoid affecting
the flags if a dummy animation is set (a transition is about to
start) and shown alpha is 0, which indicates that the window is
entering.

Test: go/wm-smoke
Test: With light wallpaper, go home -> recents
Test: All other common transitions with light status bar
Test: Open camera, go to gallery, go home, double click power
button to reopen camera (regression test)

Change-Id: I6cddc3b8eb09c547618d7572195889de7766d838
Fixes: 65398267

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357...
Tony Mak [Mon, 11 Sep 2017 14:52:59 +0000 (14:52 +0000)]
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a  -s ours
am: 9c358ccbe2  -s ours

Change-Id: I18c8460309c8330504d50eb16ce3cb39b36d2ee1

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357...
Tony Mak [Mon, 11 Sep 2017 14:43:33 +0000 (14:43 +0000)]
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2
am: 79a32d0a8a  -s ours

Change-Id: I4b97babe4f5259c71bb301d08318e09eb4560e37

6 years agoMerge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 14:40:02 +0000 (14:40 +0000)]
Merge "Work around issue #65333586: Took phone out of pocket..." into oc-mr1-dev

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357...
Tony Mak [Mon, 11 Sep 2017 14:36:08 +0000 (14:36 +0000)]
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3
am: 4453c3cda2

Change-Id: Ic48643564a3685bc602c66901c9761b741b148a5

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357
Tony Mak [Mon, 11 Sep 2017 14:28:44 +0000 (14:28 +0000)]
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357
am: 68cce397b3

Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32

6 years agoAudioPackageGo: Add misc. other sounds required by the system.
Narayan Kamath [Mon, 11 Sep 2017 14:20:42 +0000 (15:20 +0100)]
AudioPackageGo: Add misc. other sounds required by the system.

Bug: 65204114
Test: make
Change-Id: I7a6b7ec18716c912a5ace9b448c3db0b8c34b167

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227
Tony Mak [Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)]
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227
am: 34377e0357

Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev
Tony Mak [Mon, 11 Sep 2017 14:04:00 +0000 (14:04 +0000)]
resolve merge conflicts of 56a2b529373b to nyc-dev
am: d7dcc3e227

Change-Id: Ie10cba479c7d83ed001b863c648976a26ae30756

6 years agoresolve merge conflicts of 56a2b529373b to nyc-dev
Tony Mak [Mon, 11 Sep 2017 10:38:07 +0000 (11:38 +0100)]
resolve merge conflicts of 56a2b529373b to nyc-dev

Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512

Change-Id: I81183e5b5bc702fb245a6a51afe6709c5b9dd3de

6 years agoMerge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev
Andrei Stingaceanu [Mon, 11 Sep 2017 09:39:22 +0000 (09:39 +0000)]
Merge "TextView longpress 2 haptic feedback fix" into oc-mr1-dev

6 years agoMerge "DPC should not be allowed to grant development permission" into mnc-dev am...
Tony Mak [Mon, 11 Sep 2017 08:44:22 +0000 (08:44 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am: 328c129f4c am: a1cbcf5513
am: 220e7c1628

Change-Id: Ib882539bf0f362d3dbd279418d37b8fd56a9d8f1

6 years agoMerge "DPC should not be allowed to grant development permission" into mnc-dev am...
Tony Mak [Mon, 11 Sep 2017 08:36:08 +0000 (08:36 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am: 328c129f4c
am: a1cbcf5513

Change-Id: I37cafa9ee6e166e27c074e6317a6a818fe9e87a5

6 years agoMerge "DPC should not be allowed to grant development permission" into mnc-dev
Tony Mak [Mon, 11 Sep 2017 08:26:32 +0000 (08:26 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
am: 328c129f4c

Change-Id: If2d6418cf2a71b2ae3094349101e71903c016224

6 years agoMerge "DPC should not be allowed to grant development permission" into mnc-dev
TreeHugger Robot [Mon, 11 Sep 2017 08:14:19 +0000 (08:14 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev

6 years agoCheck for IControllOffload.getServer() returning null
Erik Kline [Mon, 11 Sep 2017 07:33:27 +0000 (16:33 +0900)]
Check for IControllOffload.getServer() returning null

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 65529504

Change-Id: I671487344000f1f2db92b8e4a693c096b680830c

6 years agoMerge "TV PIP: Keep the PIP at the bottom for RTL language" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 06:28:35 +0000 (06:28 +0000)]
Merge "TV PIP: Keep the PIP at the bottom for RTL language" into oc-mr1-dev

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 05:49:46 +0000 (05:49 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007  -s ours am: 3f824a362f  -s ours am: 467ed9d15a  -s ours am: 6a48feaab8  -s ours am: 67f43835ad  -s ours am: 3beb50ba24  -s ours am: d5c753a6e5  -s ours
am: 81f4636ffa  -s ours

Change-Id: Ifc1ceea9b251086ded47e6a98186175e2291d17a

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 05:35:27 +0000 (05:35 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007  -s ours am: 3f824a362f  -s ours am: 467ed9d15a  -s ours am: 6a48feaab8  -s ours am: 67f43835ad  -s ours am: 3beb50ba24  -s ours
am: d5c753a6e5  -s ours

Change-Id: I337f3213d40930c9b844a7eb246b184d9681703f

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 05:21:07 +0000 (05:21 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007  -s ours am: 3f824a362f  -s ours am: 467ed9d15a  -s ours am: 6a48feaab8  -s ours am: 67f43835ad  -s ours
am: 3beb50ba24  -s ours

Change-Id: Ife3545f0c707b9616e5d0c6026e93bc0132a09c6

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 05:09:32 +0000 (05:09 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007  -s ours am: 3f824a362f  -s ours am: 467ed9d15a  -s ours am: 6a48feaab8  -s ours
am: 67f43835ad  -s ours

Change-Id: I71f6d14cd5df5c556f4794ca581146c38d3af9c8

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 04:55:50 +0000 (04:55 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007  -s ours am: 3f824a362f  -s ours am: 467ed9d15a  -s ours
am: 6a48feaab8  -s ours

Change-Id: Ie05f69480ee2aec055dad3622072f3fc5e569e8a

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 04:41:52 +0000 (04:41 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007  -s ours am: 3f824a362f  -s ours
am: 467ed9d15a  -s ours

Change-Id: I81bac89584c667c35b7fff8ff3446c57c73cf617

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 04:29:03 +0000 (04:29 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0 am: 4b8fb78007  -s ours
am: 3f824a362f  -s ours

Change-Id: Ice5595805d71402bbfbdda2efe44e180f346d54b

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b3083...
Suprabh Shukla [Mon, 11 Sep 2017 04:10:16 +0000 (04:10 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361 am: 54f494ffc0
am: 4b8fb78007  -s ours

Change-Id: Idaff77e48bf3901ef0cbff54d3ceb19223a48338

6 years agoMerge "DPC should not be allowed to grant development permission" into oc-dev am...
Tony Mak [Mon, 11 Sep 2017 03:53:03 +0000 (03:53 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec
am: f1aea743fd

Change-Id: I80e7885580b9ac17eaf8d7f232684b357b1c84da

6 years agoMerge "DPC should not be allowed to grant development permission" into oc-dev
Tony Mak [Mon, 11 Sep 2017 03:41:57 +0000 (03:41 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev
am: 5e4b2b15ec

Change-Id: I54c0be2c389aacb367b3c8c7e749475dced25f3c

6 years agoMerge "DPC should not be allowed to grant development permission" into oc-dev
TreeHugger Robot [Mon, 11 Sep 2017 03:22:05 +0000 (03:22 +0000)]
Merge "DPC should not be allowed to grant development permission" into oc-dev

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am...
Suprabh Shukla [Sun, 10 Sep 2017 21:00:56 +0000 (21:00 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030  -s ours am: 84aa3f4c81  -s ours
am: a8e0d5f73a  -s ours

Change-Id: I34f6294cfa3d9e23bfe9b3f0edfb03da4fd5dfd2

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am...
Suprabh Shukla [Sun, 10 Sep 2017 20:47:27 +0000 (20:47 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030  -s ours
am: 84aa3f4c81  -s ours

Change-Id: I701fa204e66a8dd239e3ed3913f734e8ea503049

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am...
Suprabh Shukla [Sun, 10 Sep 2017 20:29:17 +0000 (20:29 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b
am: bf1b7e9030  -s ours

Change-Id: Ifcb9a5a08af1722bc5df28c470d4ca356b865acb

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am...
Suprabh Shukla [Sun, 10 Sep 2017 20:16:00 +0000 (20:16 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b
am: 4f31a88d4b

Change-Id: Ia97ee26a24e49809ad7484f850d256bc733ee239

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am...
Suprabh Shukla [Sun, 10 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124
am: 25ec24740b

Change-Id: I858f75717157bd9269bcd43d4198935302132d5a

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361
Suprabh Shukla [Sun, 10 Sep 2017 20:00:05 +0000 (20:00 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73 am: bf1b308361
am: 54f494ffc0

Change-Id: Ibbdf82686d13d9a554ef62774f140c57115118a3

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am...
Suprabh Shukla [Sun, 10 Sep 2017 19:48:10 +0000 (19:48 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229
am: 7d9e844124

Change-Id: Ifc197fbb16e1bb6773b2f08c7c62ca92f82238f7

6 years agoClearing up invalid entries when SyncStorageEngine starts am: 5470469d73
Suprabh Shukla [Sun, 10 Sep 2017 19:47:46 +0000 (19:47 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am: 5470469d73
am: bf1b308361

Change-Id: Ia01d70256824947bed5e88e103bc263749404fbb

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
Suprabh Shukla [Sun, 10 Sep 2017 19:32:22 +0000 (19:32 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
am: fc9e382229

Change-Id: I80e814ed0266b3868bd7039508bbc50b2e2a51aa

6 years agoClearing up invalid entries when SyncStorageEngine starts
Suprabh Shukla [Sun, 10 Sep 2017 19:32:12 +0000 (19:32 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
am: 5470469d73

Change-Id: I8ffaaf35be0e2586a5bdbbe5de6e6bd440e26017

6 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev
TreeHugger Robot [Sun, 10 Sep 2017 19:25:54 +0000 (19:25 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev

6 years agoMerge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev
TreeHugger Robot [Sun, 10 Sep 2017 05:31:42 +0000 (05:31 +0000)]
Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev

6 years agoMerge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev
TreeHugger Robot [Sun, 10 Sep 2017 04:37:35 +0000 (04:37 +0000)]
Merge "Documented use of AutofillManager.notifyViewVisibilityChanged()" into oc-mr1-dev

6 years agoRevert "Remove a compat hack SurfaceView#setWindowType()"
Yohei Yukawa [Sun, 10 Sep 2017 00:45:27 +0000 (17:45 -0700)]
Revert "Remove a compat hack SurfaceView#setWindowType()"

This CL reverts my previous CL [1] that aimed to get rid of
a nasty compatibility hack that was introduced for Bug 36345857.

For those who are interested in, what happenned are:

 1. @hide method SurfaceView#setWindowType() was removed [2].
 2. It broke some app (Bug 36345857).  We had to work around
    it by re-introducing SurfaceView#setWindowType()
    temporarily [3].
 3. Some app switched to the correct implementation when
    running on Android O devices.
 4. We removed that compatibility hack [1] (Bug 62054282).
 5. Android O MR1 is set to be "REL" [4].
 6. It broke some app, probably because of some unfortunate
    mistake in the version check logic in that app.
 7. We end up introducing the same hack again for O MR1.

 [1]: Icee198c554de558cfa4ffe0b264064969839654e
      7a1ad6d97ca1984789446211a986d5ad1b5c81e2
 [2]: Ie56b6f7ab16f32d7fc459b8eba26594337ad55de
      d5c7dd6da810a6b89151b337bea79fd817e6b72a
 [3]: I5217f6417a73690ae8a978754218b7b089070fdd
      3b5011afc9e17963607269bfb6665d04e3ab4ca1
 [4]: I054e3ecff49803e61e7741753fe6764a567d72c4
      62a835d0ef89e51f4a97fecf8576224551b545a5

Bug: 36345857
Bug: 62054282
Fixes: 65508814
Test: Manually verified that Bug 65508814 is not reproducible
Change-Id: If8a3f726789daa22f73e1962e938f071d3c09414

6 years agoMerge "Don't log TYPE_DATASET_SELECTED on dataset authentication." into oc-mr1-dev
TreeHugger Robot [Sat, 9 Sep 2017 09:04:39 +0000 (09:04 +0000)]
Merge "Don't log TYPE_DATASET_SELECTED on dataset authentication." into oc-mr1-dev

6 years agoMerge "Destroy Save UI when it's hidden without a pending restoration." into oc-mr1-dev
TreeHugger Robot [Sat, 9 Sep 2017 07:03:01 +0000 (07:03 +0000)]
Merge "Destroy Save UI when it's hidden without a pending restoration." into oc-mr1-dev

6 years agoMerge "Added more logging to diagnose a racy runtime restart." into oc-mr1-dev
TreeHugger Robot [Sat, 9 Sep 2017 04:01:35 +0000 (04:01 +0000)]
Merge "Added more logging to diagnose a racy runtime restart." into oc-mr1-dev

6 years agoDestroy Save UI when it's hidden without a pending restoration.
Felipe Leme [Fri, 8 Sep 2017 16:37:57 +0000 (09:37 -0700)]
Destroy Save UI when it's hidden without a pending restoration.

This scenario typically happens when the BACK button is tapped after
the SaveUI is restored.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.SimpleSaveActivityTest#testTapLink_launchTrampolineActivityThenTapBackAndStartNewSession
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.PreSimpleSaveActivityTest#testTapLink_launchTrampolineActivityThenTapBackAndStartNewSession
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes: 65459113

Merged-In: I07c6d9b6d219889c50caeaff99b883841b87d9cc
Change-Id: I07c6d9b6d219889c50caeaff99b883841b87d9cc