OSDN Git Service
Svet Ganov [Fri, 20 Jan 2017 01:41:11 +0000 (01:41 +0000)]
Use separate switch ops for runtime permissions
am:
e710a6fc66
Change-Id: I86cd237bffdde972de69b91fa086ac5f5ec349e8
Jiaquan He [Thu, 19 Jan 2017 23:23:56 +0000 (15:23 -0800)]
2D Recents: handle keyboard config changes.
While attaching or detaching a physical keyboard, we should handle the
configuration change in RecentsActivity, so that the activity isn't
relaunched and causes abnormal behaviors.
Test: Checked that while keyboard is attached or detached, Recents
behaves normally.
Bug:
32101881
Change-Id: Ibd185aeb48b31dbde032e235fdcaa17fbcdd9c8a
TreeHugger Robot [Thu, 19 Jan 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Add arrow key navigation support to Grid-based Recents." into nyc-mr2-dev
Svet Ganov [Thu, 22 Sep 2016 02:50:14 +0000 (19:50 -0700)]
Use separate switch ops for runtime permissions
If permissions review is enabled we allow individual
control of fine graned permissions in the SMS group.
This change ensures these permissions use the
corresponding app op as a switch to allow indifidual
control.
Change-Id: I83cd78a78a8266df8324b8a10cd9e36c04ff3112
(cherry picked from commit
99e4d51584202433f1628faa3441e5ced5cf7a0f)
TreeHugger Robot [Thu, 19 Jan 2017 07:57:11 +0000 (07:57 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev
Lorenzo Colitti [Thu, 19 Jan 2017 06:27:20 +0000 (06:27 +0000)]
Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev
Erik Kline [Thu, 19 Jan 2017 05:24:26 +0000 (14:24 +0900)]
Eschew unspecified IP addresses for DNS servers
Test: as follows
- built
- flashed
- booted
- runtest frameworks-wifi passes (though no test covers this code yet)
Bug:
34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
TreeHugger Robot [Thu, 19 Jan 2017 04:43:46 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 19 Jan 2017 04:43:03 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Hisanobu Watanabe [Tue, 7 Jun 2016 10:55:41 +0000 (19:55 +0900)]
VPN reconnection fails after manually disabling VPN
When disabling VPN manually, there was no trigger for ipsec-tools to
send “delete message” to VPN server. Therefore, connection information
is left in VPN server and next connection fails.
Fix this issue as below:
- Add “delete message” sending via flush in ipsec-tools when racoon
daemon stops
- Keep daemon alive when VPN.java exit() to let it finish sending to
VPN server
- Move close(socket) and stop(daemon) in VPN.java execute()
and monitorDaemons() to run() to gather cleaning block.
(cherry picked from commit
047454c759b46bbadb87ee3b64bf3e29afda48d6)
Change-Id: Ibfbd389b17de5b5a5d23cba59c8d1e05fbe12c15
Bug:
28279646
Bug:
33467086
Michael Wright [Thu, 19 Jan 2017 02:16:46 +0000 (02:16 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev
am:
05b2d3eb0d
Change-Id: I3a11e06dfe3f476b791838241bfb36e5362063ab
Michael Wright [Thu, 19 Jan 2017 02:16:42 +0000 (02:16 +0000)]
Validate custom pointer icons aren't null.
am:
35068079c8
Change-Id: I37fdde3c1ea735c4888760f3aab43caf7711dd0e
TreeHugger Robot [Thu, 19 Jan 2017 02:12:10 +0000 (02:12 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev
TreeHugger Robot [Thu, 19 Jan 2017 01:26:00 +0000 (01:26 +0000)]
Merge "2D Recents: polish the app -> recents transition" into nyc-mr2-dev
Bill Yi [Thu, 19 Jan 2017 01:06:36 +0000 (17:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5becba7c3473850f08ce948491d37b2cc2f5e35f
Auto-generated-cl: translation import
Bill Yi [Thu, 19 Jan 2017 00:57:28 +0000 (16:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c14cd3eb5a5d0a4d1640458bcad2aa160cdddca
Auto-generated-cl: translation import
Daniel Nishi [Thu, 19 Jan 2017 00:33:13 +0000 (00:33 +0000)]
Merge "Remove the requirement of the --checkin flag." into nyc-mr2-dev
Manu Cornet [Wed, 18 Jan 2017 23:42:14 +0000 (15:42 -0800)]
2D Recents: polish the app -> recents transition
* Do not draw the header as part of the transition thumbnail
since the header is already shown. Just let the thumbnail
slot into the task view already drawn on screen.
* Shift the target rectangle by the header height so that
the end state of the animation corresponds exactly to the
task view layout.
* Remove unused local variable.
Bug:
32101881
Bug:
33752154
Test: Checked/screencasted recents -> app -> recents animations on local sw600dp device
Change-Id: I4c8ce52b378567114735e6bd582572124a2a354c
TreeHugger Robot [Wed, 18 Jan 2017 23:51:32 +0000 (23:51 +0000)]
Merge "2D Recents: use a different background color for drop targets" into nyc-mr2-dev
TreeHugger Robot [Wed, 18 Jan 2017 23:34:05 +0000 (23:34 +0000)]
Merge "2D Recents: to and from home, animate task views as a block" into nyc-mr2-dev
Christine Franks [Wed, 18 Jan 2017 23:24:44 +0000 (23:24 +0000)]
Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev
TreeHugger Robot [Wed, 18 Jan 2017 23:09:38 +0000 (23:09 +0000)]
Merge "Add isChildDocument to MtpDocumentsProvider." into nyc-mr2-dev
TreeHugger Robot [Wed, 18 Jan 2017 22:54:36 +0000 (22:54 +0000)]
Merge "Not create document under the device." into nyc-mr2-dev
Jiaquan He [Wed, 11 Jan 2017 22:47:00 +0000 (14:47 -0800)]
Add arrow key navigation support to Grid-based Recents.
Test: Checked that arrow key navigation works in Recents on local
sw600dp devices. Also checked that Recents works properly on phones.
Bug:
32101881
Change-Id: I8ece3fc4c9ae82916efcbbde72d40805e43cc70d
TreeHugger Robot [Wed, 18 Jan 2017 22:14:20 +0000 (22:14 +0000)]
Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev
TreeHugger Robot [Wed, 18 Jan 2017 22:06:20 +0000 (22:06 +0000)]
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev
Svet Ganov [Wed, 18 Jan 2017 21:04:21 +0000 (21:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
am:
b8c8b67789 -s ours
Change-Id: I502a61cc0c1c6caaf18a7d0c03aa558541b3c17f
Svet Ganov [Wed, 18 Jan 2017 21:04:19 +0000 (21:04 +0000)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am:
4a601f972a -s ours
Change-Id: Id66c49cfa6010ab327f46e85a6940bd52102eeea
TreeHugger Robot [Wed, 18 Jan 2017 20:57:07 +0000 (20:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
Manu Cornet [Tue, 10 Jan 2017 21:26:25 +0000 (13:26 -0800)]
2D Recents: use a different background color for drop targets
Bug:
32101881
Test: Checked layout and animations in Recents, on local sw600dp device.
Change-Id: I628bd0866691e5badd7a37c88020e1e10e1902f7
Michael Wright [Wed, 18 Jan 2017 18:09:29 +0000 (18:09 +0000)]
Validate custom pointer icons aren't null.
Bug:
33853287
Test: cts
Change-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df
(cherry picked from commit
b004b5137e12bffae9a3d3ae97440c8c24bdc07a)
Manu Cornet [Wed, 21 Dec 2016 02:42:16 +0000 (18:42 -0800)]
2D Recents: to and from home, animate task views as a block
Bug:
32101881
Test: Checked animations to/from home on local sw600dp device
Change-Id: I74b8b02bb39be6d4e4553f7d74550ff177d47a5e
Svet Ganov [Tue, 17 Jan 2017 21:50:46 +0000 (13:50 -0800)]
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
Bug:
34193954
Change-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917
(cherry picked from commit
6130fb741c86d7d4f0f86e3a875c3eca1fe8aa51)
Kenny Guy [Wed, 18 Jan 2017 17:47:02 +0000 (17:47 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af am:
ee9f03d1ed
am:
1894632864
Change-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623
Christine Franks [Wed, 18 Jan 2017 17:37:15 +0000 (09:37 -0800)]
DO NOT MERGE - Fix demo mode reset notification
Bug:
34358856
Test: manually verified that tapping the Reset notification
triggers a reset after initial provisioning.
Change-Id: I7cf4db729384630a85b22ca9b4947198974a8fbf
Kenny Guy [Wed, 18 Jan 2017 17:33:33 +0000 (17:33 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a am:
b275a205af
am:
ee9f03d1ed
Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
Kenny Guy [Wed, 18 Jan 2017 17:27:10 +0000 (17:27 +0000)]
Fix issue with saving admins before finishing loading. am:
f98ed6863a
am:
b275a205af
Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
Kenny Guy [Wed, 18 Jan 2017 17:13:31 +0000 (17:13 +0000)]
Fix issue with saving admins before finishing loading.
am:
f98ed6863a
Change-Id: I7f816c164548df86f9607c86772902efd0d53620
Tucker Sylvestro [Wed, 18 Jan 2017 16:34:50 +0000 (16:34 +0000)]
svc nfc should support watches too
am:
1876583bfb
Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297
Tucker Sylvestro [Wed, 14 Dec 2016 19:01:14 +0000 (14:01 -0500)]
svc nfc should support watches too
Check for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the
"svc nfc" command. Watches may only have the latter, but should still
support the nfc enable/disable command.
See b/
24532713#comment7 for context.
Bug
32386425
Change-Id: I307798f00728c6b437aebfcf58115af7265e3692
Kenny Guy [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +0000)]
Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit
adbda7474cc1968b66e9948aee566dc346e71340)
Sunny Goyal [Wed, 18 Jan 2017 01:45:52 +0000 (01:45 +0000)]
Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev
Makoto Onuki [Wed, 18 Jan 2017 01:26:56 +0000 (01:26 +0000)]
Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev
Kenny Guy [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +0000)]
Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
Jiaquan He [Thu, 5 Jan 2017 21:00:29 +0000 (13:00 -0800)]
Add keyboard support to Grid-based Recents.
Test: Checked that pressing tab, shift + tab, alt + tab, alt + shift +
tab work for task navigation in Recents on local sw600dp device. Also
checked that Recents on phones work properly.
Bug:
32101881
Change-Id: I3e4cd212d2900523ece30a85cae7fb73a9594efb
Svetoslav Ganov [Tue, 17 Jan 2017 23:03:42 +0000 (23:03 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am:
332762aaf0
am:
df459cb2ea
Change-Id: I1239cde924e6d31222bf108c6d55ff19a78019ad
Svetoslav Ganov [Tue, 17 Jan 2017 23:02:52 +0000 (23:02 +0000)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am:
016c9c8cb5
am:
a7ff8fbe74
Change-Id: Ic372436ee48a9f725c178a72c057a2192aad9267
Svetoslav Ganov [Tue, 17 Jan 2017 22:58:21 +0000 (22:58 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
am:
332762aaf0
Change-Id: I20cc197cc2f1d4d9dd0b6b6c6fee07e71dd4a1d3
Svetoslav Ganov [Tue, 17 Jan 2017 22:58:18 +0000 (22:58 +0000)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction.
am:
016c9c8cb5
Change-Id: Ib33d75a050a1b79de9590f2dbe03609c6e2b4463
Selim Cinek [Tue, 17 Jan 2017 22:57:08 +0000 (22:57 +0000)]
Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev
TreeHugger Robot [Tue, 17 Jan 2017 22:53:38 +0000 (22:53 +0000)]
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
Jiaquan He [Tue, 17 Jan 2017 21:25:33 +0000 (13:25 -0800)]
2D Recents: Fix issue with undocking only one task
While there's only one task and we undock it, it's not in the Recents
task list. In this change, we just reset the transform and return it.
Test: Checked that Recents works properly while docking and undocking a
task and it's the only task running.
Bug:
32101881
Change-Id: I1207b546ff2864018c8d9bf2520f4690762b2d27
Svet Ganov [Tue, 17 Jan 2017 22:27:40 +0000 (22:27 +0000)]
DO NOT MERGE: Propagate revoked permissions in permission review mode
am:
4518d0be16
Change-Id: Id0525c380c7b9aaf8c160b1e4fad24b9b2756a0d
Svet Ganov [Tue, 17 Jan 2017 03:22:37 +0000 (19:22 -0800)]
DO NOT MERGE: Propagate revoked permissions in permission review mode
In permission review mode we represent install permissions for legacy
apps as constantly granted runtime ones since we need to keep per
user flags associated with a permission. We were not propagating
a revoked permission for a legacy app when the later is upgraded to
a modern app when permission review is enabled.
Test: CTS test passes and manual testing worked fine
Bug:
34240393
Change-Id: I32b8ffee89cc034661f8eb5a172dbe2349ea4a18
(cherry picked from commit
fe0253b34ec4fdb6afceb11193f29029b524866a)
TreeHugger Robot [Tue, 17 Jan 2017 22:01:20 +0000 (22:01 +0000)]
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev
Manu Cornet [Tue, 17 Jan 2017 21:58:05 +0000 (21:58 +0000)]
Merge "2D Recents: Always use grid layout even in split view" into nyc-mr2-dev
Manu Cornet [Fri, 13 Jan 2017 17:21:26 +0000 (09:21 -0800)]
2D Recents: Always use grid layout even in split view
Simplify the logic a bit, and polish the algorithm to accommodate the
various layout possibilities.
Bug:
32101881
Test: Checked layout in all orientations, with and without split view
Change-Id: I4a6dd3f7f34664908294ddaf5ea516d8e258edbf
Daniel Nishi [Tue, 17 Jan 2017 21:28:29 +0000 (13:28 -0800)]
Remove the requirement of the --checkin flag.
Bug:
34351332
Test: Manual
Change-Id: Iae8c5782f54c84fc19307468da17a067428c1b2d
Jesse Hall [Tue, 17 Jan 2017 20:34:14 +0000 (12:34 -0800)]
DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"
This reverts commit
93f630e1c3011a36f6560fd6115cf1a0e809c5e0.
Change has already been reverted in master, hence DO NOT MERGE.
Bug:
34348911
TreeHugger Robot [Tue, 17 Jan 2017 18:42:42 +0000 (18:42 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev
Jesse Hall [Mon, 12 Dec 2016 20:53:02 +0000 (12:53 -0800)]
Create GraphicsEnvironment for communicating with driver loaders
The GraphicsEnvironment class is given information during application
start, and makes it available to EGL/GLES/Vulkan loaders that don't
have easy access to the VM or to the application Context. Currently
only the driver path is handled, but the existing support for setting
library paths (for Vulkan extensions) and cache directory information
should move here.
Bug:
33531483
Change-Id: I4e4e7fb21f1bcc67122e9173514af5f18c063991
Merged-In: I5820d3d1301d5461e10706f551b268c54d4f8926
TreeHugger Robot [Sat, 14 Jan 2017 05:54:14 +0000 (05:54 +0000)]
Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev
Jesse Hall [Mon, 12 Dec 2016 05:22:16 +0000 (21:22 -0800)]
Stop preloading EGL/GLES in Zygote
It's not clear this actually makes much difference on modern
devices/drivers. With updatable graphics drivers, we'd have to be able
to unload the preloaded driver from processes that don't use the
system driver, which is additional complexity and risk.
On bullhead and sailfish, meminfo actually showed slightly more memory
available while sitting at launcher just after boot with this change
than previously. Looking at detailed stats, the differences appeared
to mostly within run-to-run variation, but there wasn't evidence of a
regression.
Bug:
33531483
Test: boot through lockscreen/launcher
Change-Id: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75
Merged-In: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75
Wei Liu [Sat, 14 Jan 2017 03:58:19 +0000 (03:58 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
am:
7a6c54128a
Change-Id: Ide990adaf580e1e5b06a24484c13c090746d65fa
Wei Liu [Sat, 14 Jan 2017 03:51:52 +0000 (03:51 +0000)]
Add WearCellularMediatorService to the system server.
am:
d741f3de81
Change-Id: Ica3d90c3748d79b28bf9cad1b3b5468f919e7299
TreeHugger Robot [Sat, 14 Jan 2017 03:46:06 +0000 (03:46 +0000)]
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
Wei Liu [Tue, 13 Dec 2016 23:44:55 +0000 (15:44 -0800)]
Add WearCellularMediatorService to the system server.
Bug:
33589216
Change-Id: Icfee08b27c03567ed45e136fc407b51c768515c2
TreeHugger Robot [Sat, 14 Jan 2017 01:02:43 +0000 (01:02 +0000)]
Merge "Treat Latin American locales specially" into nyc-mr2-dev
Selim Cinek [Fri, 13 Jan 2017 22:43:43 +0000 (14:43 -0800)]
Not allowing foreground services to be cleared as children
forground service notifications could simply be cleared
when they were sent as notification children and then
the summary was cancelled.
This also cleans up the logic in systemui and only removes
the child if allowed.
The clear all button could also show under certain conditions
where it shouldn't have been shown.
Change-Id: I85998b5342bd75425cc6d68e96391299c4f3d83d
Test: manual
Bug:
33766648
Sudheer Shanka [Sat, 14 Jan 2017 00:10:05 +0000 (00:10 +0000)]
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
Muyuan Li [Fri, 13 Jan 2017 21:49:51 +0000 (21:49 +0000)]
Merge "update navbar assets for sw900dp device." into nyc-mr2-dev
Chris Craik [Fri, 13 Jan 2017 21:46:51 +0000 (21:46 +0000)]
Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
Andrew Scull [Fri, 13 Jan 2017 21:17:23 +0000 (21:17 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542 am:
66d66dd50c
am:
b2db3761cd
Change-Id: I166a09f1b41c32bb69e2859ef262b9d46996ac87
Andrew Scull [Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev am:
eb35ad9969
am:
3aac3ebee1
Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
Philip P. Moltmann [Fri, 13 Jan 2017 21:15:18 +0000 (21:15 +0000)]
Do not write if apply() did not change the file. am:
1f99f81bdc
am:
331a4bb8d4
Change-Id: If200192c12477a4410b0b358e6c7b430c23d1499
Philip P. Moltmann [Fri, 13 Jan 2017 21:14:17 +0000 (21:14 +0000)]
Only persist last Shared Preferences state am:
d15c4f1da5
am:
889a420a9e -s ours
Change-Id: I1e440bdfc8d12f30eb6db95b365c15b66479d95d
Justin Klaassen [Fri, 13 Jan 2017 21:00:06 +0000 (21:00 +0000)]
Merge "Add support for carrier demo mode" into nyc-mr2-dev
Pankaj Kanwar [Fri, 13 Jan 2017 20:45:59 +0000 (20:45 +0000)]
Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev
TreeHugger Robot [Fri, 13 Jan 2017 20:24:47 +0000 (20:24 +0000)]
Merge "Add logging for high temp warning." into nyc-mr2-dev
TreeHugger Robot [Fri, 13 Jan 2017 19:54:18 +0000 (19:54 +0000)]
Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev
Justin Klaassen [Wed, 11 Jan 2017 23:54:17 +0000 (15:54 -0800)]
Add support for carrier demo mode
Fixes:
33746309
Test: manually verified carrier demo mode and normal demo mode are setup
correctly
Change-Id: Ia38790599f672a9d1999274276156b5328c9f75a
Andrew Scull [Fri, 13 Jan 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473 am:
ea9463f542
am:
66d66dd50c
Change-Id: Ic622d551181566585be89380e32658e963768cbf
Andrew Scull [Fri, 13 Jan 2017 17:17:49 +0000 (17:17 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
am:
eb35ad9969
Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
Andrew Scull [Fri, 13 Jan 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev am:
97848fc473
am:
ea9463f542
Change-Id: I76b21c0ea4ab7394281ee8c82ed67179eb9ea966
Andrew Scull [Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
Andrew Scull [Fri, 13 Jan 2017 14:52:26 +0000 (14:52 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
am:
97848fc473
Change-Id: I12d9a6d18654673e5912416550c64e81aab857f9
Andrew Scull [Fri, 13 Jan 2017 13:16:09 +0000 (13:16 +0000)]
resolve merge conflicts of
e4cefbf4fce4 to nyc-dr1-dev
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
Andrew Scull [Fri, 13 Jan 2017 12:18:42 +0000 (12:18 +0000)]
Merge "Don't save password metrics to disk." into nyc-dev
Michal Karpinski [Fri, 13 Jan 2017 09:47:21 +0000 (09:47 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
pkanwar [Fri, 13 Jan 2017 03:17:00 +0000 (19:17 -0800)]
DO NOT MERGE: Fix to maintain the Carrier Network connection.
Added isCarrierNetwork param in WifiConfiguration, which is then used in
WifiStateMachine. After this change, the connection to Carrier Network
should be maintained.
BUG:
30760683
Change-Id: I88e01ff44f494a6eda5e2e8a088d069638b72c89
Chris Craik [Fri, 13 Jan 2017 03:17:19 +0000 (19:17 -0800)]
Support shadows and reordering in ViewOverlay
Bug:
32726440
Test: manual
Change-Id: Ic5d7efdee5a493b7768b9db8150f65f97b3f0a64
TreeHugger Robot [Fri, 13 Jan 2017 02:31:08 +0000 (02:31 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
Roozbeh Pournader [Tue, 10 Jan 2017 23:24:32 +0000 (15:24 -0800)]
Treat Latin American locales specially
Due to legacy reasons, Android translations of European Spanish were
kept under 'es', while Latin American Spanish translations were kept
under 'es-US'. The combination of this, and the new locale
preference rules in Nougat, resulted in 'es' winning over 'es-US' for
all Latin American locales, since 'es' was a direct ancestor, while
'es-US' was just a fallback.
The changes in Nougat had assumed that app developers would put Latin
American Spanish translations under 'es-419', but that could create a
backward-compatibility problem under older Android versions that did
not support three-digit region codes properly.
This CL keeps the Nougat logic and its locale parent tree, but
special-cases es-US and es-MX to be treated as equivalents of es-419
in cases where they are present and es-419 is not.
Bug:
31545805
Bug:
34126460
Test: unit tests are included
Change-Id: Iab26f41294587ee044685a5a6560520c7cbb06f7
(cherry picked from commit
a192a8ced65ceea8bfe44f0eac6a394cbf80d936)
Andrew Sapperstein [Fri, 13 Jan 2017 01:21:12 +0000 (17:21 -0800)]
Add logging for high temp warning.
Adds a log line that prints the current and throttling temps
when we decide to show the notification.
Test: manual
Bug:
34256597
Change-Id: I4d0a1993e0b073d68fbc65f9aa765f5343a69dc5
Philip P. Moltmann [Fri, 13 Jan 2017 01:10:01 +0000 (01:10 +0000)]
Do not write if apply() did not change the file.
am:
1f99f81bdc
Change-Id: I4dd94b4f862f6c3d5ada9961d75cc2f91886edf1
Philip P. Moltmann [Fri, 13 Jan 2017 01:09:03 +0000 (01:09 +0000)]
Only persist last Shared Preferences state
am:
d15c4f1da5
Change-Id: I6431d4b7d07064eec5013d01b5bda76b1ed35e14
Manu Cornet [Wed, 11 Jan 2017 20:32:54 +0000 (12:32 -0800)]
DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
Bug:
32101881
Test: Checked layout in various situations when switching orientation
Change-Id: Iae1f142f6568890512e24787d78cfb1e15280feb
Manu Cornet [Thu, 12 Jan 2017 23:05:13 +0000 (15:05 -0800)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
Bug:
32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: Ic3e3af6e8db4a62028e1283e915a7cd12db49607
Philip P. Moltmann [Wed, 14 Dec 2016 00:32:06 +0000 (16:32 -0800)]
Do not write if apply() did not change the file.
Bug:
33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
Philip P. Moltmann [Wed, 14 Dec 2016 00:23:21 +0000 (16:23 -0800)]
Only persist last Shared Preferences state
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.
For commit() we need to make sure that we have at least persisted the
state of the commit.
Generation counts are 64 bit, hence they never overflow.
Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug:
33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit
31d6889f4c89dd8498e2095f9d8a3c39fbd17c86)