OSDN Git Service
Love Khanna [Sat, 22 Jul 2017 01:05:46 +0000 (01:05 +0000)]
NFC DTA Integration am:
b54567810f -s ours
am:
3cf0b6926f -s ours
Change-Id: I4b06a5031f7a69ce88871a0600abe80174e21e23
Love Khanna [Sat, 22 Jul 2017 00:59:17 +0000 (00:59 +0000)]
NFC DTA Integration
am:
b54567810f -s ours
Change-Id: I0a95d61bcc814a922453ebf024f4675367ec8bf0
Makoto Onuki [Sat, 22 Jul 2017 00:58:01 +0000 (00:58 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
am:
5bbf44e715
Change-Id: I0ca842e1a2c2986c0b6fa9d7eca162cb2cb737af
TreeHugger Robot [Sat, 22 Jul 2017 00:45:24 +0000 (00:45 +0000)]
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
Bookatz [Sat, 22 Jul 2017 00:41:54 +0000 (00:41 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am:
2337b3ba84
Change-Id: I9d0a3c1ac05f9583fe98b169037e008cc36315b3
TreeHugger Robot [Sat, 22 Jul 2017 00:35:10 +0000 (00:35 +0000)]
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
Wyatt Riley [Sat, 22 Jul 2017 00:18:42 +0000 (00:18 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am:
ec996b381d
Change-Id: Ifa49f58660363d78d79eaa3851fe818fb6b75763
Love Khanna [Sat, 22 Jul 2017 00:14:17 +0000 (00:14 +0000)]
NFC DTA Integration
am:
276f9fe619 -s ours
Change-Id: I34e2fa236f5e590f4f21dcc45e1fa8a045c37ade
TreeHugger Robot [Sat, 22 Jul 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Steven Moreland [Fri, 21 Jul 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148 am:
d37f13603a
am:
e3d7919730
Change-Id: Idfa23e4e3498b1e65738a79f291008d96974a32e
Steven Moreland [Fri, 21 Jul 2017 23:34:17 +0000 (23:34 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder.""" am:
e8341b6148
am:
d37f13603a
Change-Id: Ib0d843954f0a4854b6cea5ef3a4e0ad1ed4f29cb
Steven Moreland [Fri, 21 Jul 2017 23:27:27 +0000 (23:27 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
am:
e8341b6148
Change-Id: I1337a9b40fdf762cc0150983536981f0a163750a
David Friedman [Fri, 21 Jul 2017 23:22:40 +0000 (23:22 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
cde37c8836
Change-Id: I5939c2e5fcaa87fb68964c8deb037f99b0883e82
Treehugger Robot [Fri, 21 Jul 2017 23:18:09 +0000 (23:18 +0000)]
Merge "Revert "Revert "Update for less arguments in hidl toBinder."""
David Friedman [Fri, 21 Jul 2017 23:15:50 +0000 (23:15 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev am:
e4d0557334
am:
f20c492190
Change-Id: Iec159fcb65676b0b41de5f0ec29b919fdfa8a14f
David Friedman [Fri, 21 Jul 2017 23:11:16 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
am:
e4d0557334
Change-Id: I931088e43f29707e1ab5d9764a06adbbe5af1d7e
David Friedman [Fri, 21 Jul 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
am:
e4d0557334
Change-Id: If97a3685c4e55ca006d1876a0378a772bf784c2d
Fan Zhang [Fri, 21 Jul 2017 23:06:20 +0000 (23:06 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
am:
689359914d
Change-Id: I351f0df469be67b5998567d7fb9ff0163d613a1d
David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
TreeHugger Robot [Fri, 21 Jul 2017 22:59:13 +0000 (22:59 +0000)]
Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev
Makoto Onuki [Fri, 21 Jul 2017 22:30:35 +0000 (15:30 -0700)]
Persist/pacel # of periodic syncs properly.
(Note it shouldn't be persisting parceled data in the first place. There's
already a bug filed for that.)
Bug
63935632
Test: manaul test
Change-Id: I5385caa6cd0663c7e13db0256b2c1027abe6c3a1
Bookatz [Fri, 21 Jul 2017 16:03:23 +0000 (09:03 -0700)]
Batterystats: fix inappropriate bg timebase reset
Previously, the background timebases (of a Uid) were reset when the Uid
resets in the wrong place. This caused StopwatchTimer.reset() to have the timesbase's old value to keep
track of its mUpdateTime. The solution is to call TimeBase.init at the
start of Uid.reset(), instead of calling TimeBase.reset() at the end of
Uid.reset().
Bug:
62352334
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I23c886544e18f154fc226cc81c22c3ea70fb4c7e
Wyatt Riley [Mon, 3 Jul 2017 22:14:42 +0000 (15:14 -0700)]
Fix RemoteListenerHelper vs. HAL deadlock
Releasing lock before calling into HAL.
Fixes:
62776535
Bug:
63264577
Test: Build, GNSS location & GnssMeasurement toggling
Reproed issue with test sleep code without fix and passed with.
Change-Id: I44e183e98edd972619a068bbcc95468e9a9cdee1
Hall Liu [Fri, 21 Jul 2017 21:29:24 +0000 (21:29 +0000)]
Merge "Make slight API and doc adjustments" am:
b7e10650d8 am:
14be4e65b2
am:
0f18557df8
Change-Id: I84aa982760377be0df6f8fbca6d5a32d1036f16a
Steven Moreland [Fri, 21 Jul 2017 19:29:54 +0000 (19:29 +0000)]
Revert "Revert "Update for less arguments in hidl toBinder.""
This reverts commit
243bcfda3ac35735a959f8abcc45186aba0af116.
(originally reverted due to merge conflicts)
Bug:
32172906
Test: hidl_test
Change-Id: I70fde3ffe0d2c67390f7152acedd45c39009a134
Hall Liu [Fri, 21 Jul 2017 21:23:36 +0000 (21:23 +0000)]
Merge "Make slight API and doc adjustments" am:
b7e10650d8
am:
14be4e65b2
Change-Id: Ida2487f5be62ea6f4de0668abb830590494c880a
Hall Liu [Fri, 21 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Merge "Make slight API and doc adjustments"
am:
b7e10650d8
Change-Id: I96a361924ddff300eb36933bed67d30ec00e8f87
Hall Liu [Fri, 21 Jul 2017 21:09:34 +0000 (21:09 +0000)]
Merge "Make slight API and doc adjustments"
Evan Laird [Fri, 21 Jul 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
am:
cdcbbeccb7
Change-Id: Ia779dc0b9ffdcc599a041d6ffed9f9273f8307f3
TreeHugger Robot [Fri, 21 Jul 2017 20:25:09 +0000 (20:25 +0000)]
Merge "Update icons in the volume rocker" into oc-dr1-dev
Fan Zhang [Fri, 21 Jul 2017 17:21:36 +0000 (10:21 -0700)]
Fix suggestion crash if parser fails to parse dismiss rule
We store a index value in shared pref to figure out when a suggestion
should be displayed next time. However the rule can change due to
various reasons. When the index and the rule itself go out of sync, we
should not crash.
Merged-In: Id3ea88b6d321434e20ac0cd3e2670524c237e24e
Change-Id: Ied4a0359f9bc22ee94ec79c0591d2671a9c31b86
Fix:
63908636
Test: robotests
Steven Moreland [Fri, 21 Jul 2017 19:52:04 +0000 (19:52 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder."" am:
79994cb142 am:
16255fda63
am:
4e743f680e
Change-Id: Iff1739cb98d1f978f6246bbd73a8163822e2e6c7
Steven Moreland [Fri, 21 Jul 2017 19:43:34 +0000 (19:43 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder."" am:
79994cb142
am:
16255fda63
Change-Id: I6e295f30bef2de7fe1840da821db7ea4d8ef72ec
Steven Moreland [Fri, 21 Jul 2017 19:28:14 +0000 (19:28 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
am:
79994cb142
Change-Id: I325335a278fc9aebf7957e23089c72665169eeb3
Steven Moreland [Fri, 21 Jul 2017 19:14:24 +0000 (19:14 +0000)]
Merge "Revert "Update for less arguments in hidl toBinder.""
Steven Moreland [Fri, 21 Jul 2017 19:13:05 +0000 (19:13 +0000)]
Revert "Update for less arguments in hidl toBinder."
This reverts commit
de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d.
Change-Id: I6f451b0a05759501f59921747d95c6ae5b7ce656
Christine Franks [Fri, 21 Jul 2017 19:00:31 +0000 (19:00 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
am:
484115b77d
Change-Id: Id9f50aeab430db43e9f18bcdfd80b6dcac2c43a7
Christine Franks [Fri, 21 Jul 2017 18:53:16 +0000 (18:53 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev
Albert Chaulk [Fri, 21 Jul 2017 18:32:10 +0000 (18:32 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
am:
c48e304bbf
Change-Id: I7258810e7e1d4a7ad8dcf60efcf8ea6226137167
Android Build Merger (Role) [Fri, 21 Jul 2017 18:29:42 +0000 (18:29 +0000)]
Merge "Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev am:
672f578fd1" into oc-dr1-dev-plus-aosp
Christopher Tate [Fri, 21 Jul 2017 18:28:22 +0000 (18:28 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
am:
672f578fd1
Change-Id: Ief696630315b5c1910c8a0721417260b1caab2d0
Steven Moreland [Fri, 21 Jul 2017 18:26:22 +0000 (18:26 +0000)]
Merge "Update for less arguments in hidl toBinder." am:
602b7be04e am:
b167ed08cc
am:
5f04958a73
Change-Id: I051734bc2fe8fd08b36756d66e3a52025fd465bc
Albert Chaulk [Fri, 21 Jul 2017 18:22:38 +0000 (18:22 +0000)]
Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
Steven Moreland [Fri, 21 Jul 2017 18:19:40 +0000 (18:19 +0000)]
Merge "Update for less arguments in hidl toBinder." am:
602b7be04e
am:
b167ed08cc
Change-Id: I9beb7a7ee639f614260e5ba69496c0e7d9836742
TreeHugger Robot [Fri, 21 Jul 2017 18:18:07 +0000 (18:18 +0000)]
Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
Love Khanna [Fri, 21 Jul 2017 18:15:53 +0000 (18:15 +0000)]
Merge "NFC DTA Integration" am:
a42c8a1667 -s ours am:
b9d0a22aaf
am:
cee0ac5fca -s ours
Change-Id: I711d3a31445d3fc694b0289fa9323d5220abd713
Steven Moreland [Fri, 21 Jul 2017 18:13:01 +0000 (18:13 +0000)]
Merge "Update for less arguments in hidl toBinder."
am:
602b7be04e
Change-Id: I61f30db7a638c8c74925509e0bee1a7fffd5c546
Love Khanna [Fri, 21 Jul 2017 18:05:55 +0000 (18:05 +0000)]
Merge "NFC DTA Integration" am:
a42c8a1667 -s ours
am:
b9d0a22aaf
Change-Id: I4350ef8f09371b73ad1155ed2297627e66acc9d8
Love Khanna [Fri, 21 Jul 2017 17:56:59 +0000 (17:56 +0000)]
Merge "NFC DTA Integration"
am:
a42c8a1667 -s ours
Change-Id: I6edab80bee45eb4f95a36273857068487ff506b7
Treehugger Robot [Fri, 21 Jul 2017 17:49:39 +0000 (17:49 +0000)]
Merge "Update for less arguments in hidl toBinder."
Treehugger Robot [Fri, 21 Jul 2017 17:38:53 +0000 (17:38 +0000)]
Merge "NFC DTA Integration"
Lucas Dupin [Fri, 21 Jul 2017 16:44:28 +0000 (16:44 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev
am:
53ddffdf3a
Change-Id: I42729d1a98ec4272671fa8ae8da7ccb6798a82fa
Lucas Dupin [Fri, 21 Jul 2017 16:34:33 +0000 (16:34 +0000)]
Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Jorim Jaggi [Fri, 21 Jul 2017 16:17:46 +0000 (16:17 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev
am:
089d45de8f
Change-Id: Ica95fc3e55e3291dd43bd5173899cf30a328021e
Jorim Jaggi [Fri, 21 Jul 2017 16:10:52 +0000 (16:10 +0000)]
Merge "Fix snapshots for dialogs" into oc-dr1-dev
Christine Franks [Sat, 24 Jun 2017 01:12:46 +0000 (18:12 -0700)]
DO NOT MERGE - Remove RetailDemoModeService
Bug:
62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Merged-In: I483f2e3518a48fbc833562e71c3acd17ad565881
Steven Moreland [Thu, 20 Jul 2017 16:24:56 +0000 (09:24 -0700)]
Update for less arguments in hidl toBinder.
Removed unnecessary templatization argument.
Test: hidl_test_java
Bug:
32172906
Change-Id: I88cd2bf7abc3065ece4e28698ba5e0d836b1d0e3
Michael Wright [Fri, 21 Jul 2017 15:38:39 +0000 (15:38 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
am:
5898d52184
Change-Id: Iec3589b58bf218f9bae61de60cb0a90ff2932277
TreeHugger Robot [Fri, 21 Jul 2017 15:30:42 +0000 (15:30 +0000)]
Merge "Add new bucket above high brightness for "sunlight"." into oc-dr1-dev
Michael Wright [Fri, 21 Jul 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
am:
cb423e42b3
Change-Id: I37bedda77be7b9d832da8dd4e9efeab714ac8d66
Adrian Roos [Fri, 21 Jul 2017 14:59:12 +0000 (14:59 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am:
5f62026b4e
Change-Id: I8710b4b748d415bb3c44ec8b5e14010f70468261
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Add config to force display to transition to off after doze" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 14:53:44 +0000 (14:53 +0000)]
Merge "Flicker free screen-on from AOD" into oc-dr1-dev
Jorim Jaggi [Thu, 20 Jul 2017 16:09:20 +0000 (18:09 +0200)]
Fix snapshots for dialogs
When taking a snapshot, always include the full stack bounds.
When showing a snapshot starting window, use the SystemUI flags
from the top fullscreen window in the task - this is the same way
as we do it when the real windows are going to be visible.
Test: Revoke contacts permissions, launch contacts, go to recents,
go back.
Test: go/wm-smoke
Fixes:
63268663
Change-Id: If8d9701f6d34abd56116ed04fe27fe82688e506a
Suprabh Shukla [Fri, 21 Jul 2017 09:34:47 +0000 (09:34 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
am:
928aad3e4d
Change-Id: I11c65cd3194427fc43fe0cea445715d1f8ce2254
TreeHugger Robot [Fri, 21 Jul 2017 09:28:52 +0000 (09:28 +0000)]
Merge "Fixing TaskPersisterTest" into oc-dr1-dev
Adrian Roos [Wed, 19 Jul 2017 16:08:07 +0000 (18:08 +0200)]
Flicker free screen-on from AOD
When pulsing from AOD, we force the display OFF first. This allows
us to transition smoothly from AOD.
Also, we add a scrim transition for whenever we are waking up from
dozing. This relies on I4f3a863709a970f0fc8682c0a0c3547886e1fd0f
which forces the DOZE -> ON transition through OFF first.
Also fixes the WAKE_AND_UNLOCK transition that happens when waking
up with the fingerprint sensor.
Also fix an issue where KeyguardViewMediator's mWakeAndUnlocking
was cleared in onScreenTurnedOff; this should have been added to
the wakefulness lifecycle instead and now that the AOD -> ON transtion
dispatches the screen off callback it broke the fingerprint unlock
transition.
Fixes:
35849781
Fixes:
63887857
Fixes:
63783651
Fixes:
63727166
Test: AOD, receive notification; AOD, unlock with fingerprint; AOD, wake to lockscreen. Verify that everything is flicker-free.
Change-Id: I7d539db80a1c7e9216cf4c5c1e6d314c1893f12d
Hugo Benichi [Fri, 21 Jul 2017 08:26:49 +0000 (08:26 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035 am:
3d423c9c39
am:
8b8a0ef586
Change-Id: I63414de17f71be8f8e24296ba820f5e855f2975f
Hugo Benichi [Fri, 21 Jul 2017 08:21:48 +0000 (08:21 +0000)]
Merge "IpManagerTest: fix flaky test for real" am:
e0a743d035
am:
3d423c9c39
Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121
Hugo Benichi [Fri, 21 Jul 2017 08:15:20 +0000 (08:15 +0000)]
Merge "IpManagerTest: fix flaky test for real"
am:
e0a743d035
Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41
Treehugger Robot [Fri, 21 Jul 2017 08:07:40 +0000 (08:07 +0000)]
Merge "IpManagerTest: fix flaky test for real"
Amith Yamasani [Fri, 21 Jul 2017 05:14:51 +0000 (05:14 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
am:
6b4f0bb6fe
Change-Id: Id069c0fd99a3a1b9ebd429c7f44542a2ae068926
Hugo Benichi [Fri, 21 Jul 2017 05:12:26 +0000 (14:12 +0900)]
IpManagerTest: fix flaky test for real
Commit
c10fe5f46367 tried to fix the flaky unit test for a default
ProvisioningConfiguration but failed to reinitialize the mock class
involved, so that in practice the flaky assertion is as flaky as before.
This patch correctly resets the mock after the default assertions are
done once an IpManager object is created.
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801
Love Khanna [Fri, 21 Jul 2017 05:09:02 +0000 (05:09 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
am:
f8469ccf17
Change-Id: I661800e26a8dc66b2a7a7676e0df11d928272f89
TreeHugger Robot [Fri, 21 Jul 2017 05:03:15 +0000 (05:03 +0000)]
Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
TreeHugger Robot [Fri, 21 Jul 2017 05:01:38 +0000 (05:01 +0000)]
Merge "NFC DTA Integration" into oc-dr1-dev
Glen Kuhne [Fri, 21 Jul 2017 02:37:55 +0000 (02:37 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
am:
860f185c66
Change-Id: Ie89e7361d90accde957dc6490dc483c4d4885c0e
TreeHugger Robot [Fri, 21 Jul 2017 02:30:17 +0000 (02:30 +0000)]
Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev
Sundeep Ghuman [Fri, 21 Jul 2017 01:01:52 +0000 (01:01 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
am:
3b63aa79eb
Change-Id: Iab18b4e433aa1de2bb4acde5db2e8b8ea5a56710
TreeHugger Robot [Fri, 21 Jul 2017 00:56:42 +0000 (00:56 +0000)]
Merge "Do not clear scores during stopTracking." into oc-dr1-dev
Winson Chung [Fri, 21 Jul 2017 00:09:46 +0000 (00:09 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
am:
a363ab9d6f
Change-Id: I05701052c0eeaef4453f044039f8fe7af2a63a2a
Winson Chung [Fri, 21 Jul 2017 00:03:27 +0000 (00:03 +0000)]
Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev
Lucas Dupin [Thu, 20 Jul 2017 00:15:41 +0000 (17:15 -0700)]
Shutdown scrim opacity at 95%
Test: visual
Change-Id: I55b61f2bdc5189da290f7b81783925cc87424ab4
Fixes:
63534082
Love Khanna [Wed, 17 May 2017 10:22:16 +0000 (15:52 +0530)]
NFC DTA Integration
Bug:
63903843
Test: compiles.
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Amit Mahajan [Thu, 20 Jul 2017 20:58:39 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
37a9991be9
Change-Id: Ib0cd3d66a4eef9d93e8f952dfd528d0cf714e8e5
Amith Yamasani [Wed, 19 Jul 2017 23:49:52 +0000 (16:49 -0700)]
Handle an edge case that can reset settings provider data
If the AtomicFile does the rename and fails when writing the
original, make sure we can at least use the backup on reboot.
Bug:
63753300
Test: Stop shell, move settings_global.xml to backup, start shell.
Change-Id: I2049b48af05161bb2c68717a71c1700a95150a6c
Amit Mahajan [Thu, 20 Jul 2017 20:47:17 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Albert Chaulk [Fri, 14 Jul 2017 16:32:57 +0000 (12:32 -0400)]
Add modified API to send more information to VrCore
Currently, null is sent when a 2D intent is running.
Sending the component name and a flag instead allows
VrCore to determine which intent is currently running
and which layers on the display correspond to this
application.
The process ID of the current intent is also sent,
to allow association of buffers to the VR app.
Bug:
63709047,
63115025
Test: manual with prints
Change-Id: I164b577f2c578867fb953d92074ef3d2d31221a1
Selim Cinek [Thu, 20 Jul 2017 20:38:27 +0000 (20:38 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev
am:
2ed613ca80
Change-Id: Id697948b665319b83b6becfa56a0148a13149ae3
Hall Liu [Fri, 14 Jul 2017 20:39:54 +0000 (13:39 -0700)]
Make slight API and doc adjustments
* Fix a compile error on Java 7
* Update initialization mechanism to allow exceptions and return codes
* App-facing api for StreamingService#dispose no longer throws an
IllegalArgumentException
* Add REASON_NONE to stream state change reasons
Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
Mady Mellor [Thu, 20 Jul 2017 20:27:38 +0000 (20:27 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
am:
0b8a985cd6
Change-Id: I94d7856d107dbf0d16f008e131fa09b7b78f748e
TreeHugger Robot [Thu, 20 Jul 2017 20:27:35 +0000 (20:27 +0000)]
Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev
Adrian Roos [Thu, 20 Jul 2017 20:17:02 +0000 (20:17 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
am:
99cc683647
Change-Id: I647b52f1f47655a2d6f9bf90a0db82866c89e0c1
TreeHugger Robot [Thu, 20 Jul 2017 20:13:30 +0000 (20:13 +0000)]
Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:05:44 +0000 (20:05 +0000)]
Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
Selim Cinek [Thu, 20 Jul 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev
am:
91a6a10195
Change-Id: I22d04dfa022e8547b261b6168b75265fdfcf0dca
Glen Kuhne [Wed, 19 Jul 2017 21:53:34 +0000 (14:53 -0700)]
Don't set AccessPoint with WifiInfo.INVALID_RSSI
This stops the RSSI of an AccessPoint object being updated from WifiInfo
for the current network, when that WifiInfo does not have a valid RSSI.
This occurs when attempting to connect to a network, and the connection
has not yet been established.
Fixes a UI bug where the signal strength would appear to be zero when
attempting to connect to something, or after failing to.
Bug:
63487286
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Test: Manual. Attempt to connect to network with bad PSK. Observe Signal
strength does not get set to zero.
Change-Id: Ia5343fb6f0935134e6a4f82034de164342fe55d4