OSDN Git Service
Jason Monk [Fri, 4 Dec 2015 14:36:36 +0000 (09:36 -0500)]
Create configure Wi-Fi screen
Add a gear on Settings menu, and move a bunch of stuff from
overflow and advanced screen to there. Also move add network
to be the last item in the list rather than in overflow.
Also fix WifiP2p breakage.
Change-Id: I5c84c25e5ba9224f77dcd988b0b2850ae6e71168
Svetoslav Ganov [Thu, 3 Dec 2015 22:52:09 +0000 (22:52 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am:
c4321c7e6c -s ours am:
142193550e -s ours
am:
994779c61e -s ours
* commit '
994779c61ef1d6b87aa98ee48c61ecc8410d0295':
[DO NOT MERGE] Modify system settings: incorrect UI state
Svetoslav Ganov [Thu, 3 Dec 2015 22:48:09 +0000 (22:48 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am:
c4321c7e6c -s ours
am:
142193550e -s ours
* commit '
142193550e6b9844631d4e34dda42e76424fed83':
[DO NOT MERGE] Modify system settings: incorrect UI state
Svetoslav Ganov [Thu, 3 Dec 2015 22:45:05 +0000 (22:45 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
am:
c4321c7e6c -s ours
* commit '
c4321c7e6caa1a3699567f9c39d2bc33bbf39c6b':
[DO NOT MERGE] Modify system settings: incorrect UI state
Svetoslav Ganov [Thu, 3 Dec 2015 22:38:54 +0000 (22:38 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
Svetoslav [Thu, 3 Dec 2015 22:36:30 +0000 (14:36 -0800)]
[DO NOT MERGE] Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:
25843134
Change-Id: I2da4eec1c3574bd6aef9ab968c9deb148536cb0a
Fyodor Kupolov [Thu, 3 Dec 2015 18:16:34 +0000 (18:16 +0000)]
Merge "Use the right userId when setting guest restrictions"
Jason Monk [Thu, 3 Dec 2015 16:08:10 +0000 (11:08 -0500)]
Guard against no payment app
Bug:
25990521
Change-Id: I3307fb197d1a38ff759628bf72f6b7e4afcb8001
Fyodor Kupolov [Thu, 3 Dec 2015 02:33:06 +0000 (18:33 -0800)]
Use the right userId when setting guest restrictions
Bug:
25977335
Change-Id: I5e58fc2d07d111d084dd33bc1fd5514b9bb6ff10
John Reck [Thu, 3 Dec 2015 00:32:40 +0000 (00:32 +0000)]
Merge "Update for rename"
John Reck [Thu, 3 Dec 2015 00:30:30 +0000 (16:30 -0800)]
Update for rename
Change-Id: I78e468d904a167bc304b11e0f2539770d352f79a
Jason Monk [Wed, 2 Dec 2015 21:10:44 +0000 (21:10 +0000)]
Merge "Work on settings launch speed"
Jason Monk [Wed, 2 Dec 2015 20:38:38 +0000 (15:38 -0500)]
Work on settings launch speed
Move some stuff to the background, avoid doing other things.
Change-Id: I145172efa16f81c2f377f07744c8f88145e2ed1d
Julia Reynolds [Wed, 2 Dec 2015 20:27:48 +0000 (20:27 +0000)]
Merge "Warn users about rule deletion when revoking DND access."
Julia Reynolds [Wed, 2 Dec 2015 13:35:49 +0000 (08:35 -0500)]
Warn users about rule deletion when revoking DND access.
Bug:
25472361
Change-Id: I5a850891733e213ac76aa67c8cb84dfa6f82b153
Julia Reynolds [Wed, 2 Dec 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Hide cell broadcast settings link if needed."
Julia Reynolds [Wed, 2 Dec 2015 17:13:57 +0000 (17:13 +0000)]
Merge "Delete unused file."
Philip P. Moltmann [Wed, 2 Dec 2015 16:34:56 +0000 (16:34 +0000)]
Merge "Show status of print job instead of deprecated state reason."
Julia Reynolds [Wed, 2 Dec 2015 14:40:36 +0000 (09:40 -0500)]
Hide cell broadcast settings link if needed.
Bug:
25939664
Change-Id: Iccf7d17267aecadff0d18f9fb4f464f3597e4c3e
Julia Reynolds [Wed, 2 Dec 2015 16:10:14 +0000 (11:10 -0500)]
Delete unused file.
Change-Id: Ibc39915c44eba7efd4964b4a10c82739f2b3da3d
Svetoslav Ganov [Wed, 2 Dec 2015 04:26:00 +0000 (04:26 +0000)]
Merge "Add optional permission review for legacy apps - settings"
Svet Ganov [Wed, 2 Dec 2015 03:57:33 +0000 (19:57 -0800)]
Add optional permission review for legacy apps - settings
Change-Id: I80058d093abf5d131cf7befba2eec5239ff854eb
Lifu Tang [Wed, 2 Dec 2015 00:06:40 +0000 (00:06 +0000)]
Merge "Remembers previous location mode when location off"
Lifu Tang [Thu, 26 Nov 2015 05:44:17 +0000 (21:44 -0800)]
Remembers previous location mode when location off
Multipart CL. Must be submitted together with ag/821599
Bug:
25608291
Change-Id: Ibfa39ba9b844421cd86a5aa4266e4389534f16be
Philip P. Moltmann [Mon, 30 Nov 2015 21:21:11 +0000 (13:21 -0800)]
Show status of print job instead of deprecated state reason.
The state reason has been replaced by the more generic status.
Change-Id: I4fd525c77bd35f1f336fbeee7744f18b1444cf9a
Paul Lawrence [Tue, 1 Dec 2015 15:13:49 +0000 (15:13 +0000)]
Merge "Store cooldown state through rotation"
Jeff Sharkey [Mon, 30 Nov 2015 20:28:19 +0000 (13:28 -0700)]
Add fallback encryption-aware home screen.
When the home screen selected by the user isn't encryption aware, we
still need to put something on the ActivityStack. For now, let's use
an empty activity that knows how to dismiss itself when the
credential-encrypted storage is unlocked; that's enough for the
system to re-resolve the home intent and find the real home screen.
Also follow method refactoring.
Bug:
22358539
Change-Id: Iebc4ad8d2dd62ada079cab03d5765f7631fd4beb
Jason Monk [Mon, 30 Nov 2015 20:45:44 +0000 (20:45 +0000)]
Merge "Make sure the dashboard is up to date"
Jason Monk [Mon, 30 Nov 2015 20:37:31 +0000 (15:37 -0500)]
Make sure the dashboard is up to date
Bug:
25794089
Change-Id: I65eaa8e14b3c998ec122eaa9fc4dbbe3749c568c
Jason Monk [Mon, 30 Nov 2015 20:11:20 +0000 (20:11 +0000)]
Merge "Guard against monkey crash."
Jason Monk [Mon, 30 Nov 2015 19:50:40 +0000 (14:50 -0500)]
Guard against monkey crash.
Bug:
25813437
Change-Id: Id86c775b235ee303dc05c1cf70a407bf5472b17c
Julia Reynolds [Mon, 30 Nov 2015 19:30:42 +0000 (19:30 +0000)]
Merge "Fix print settings crash."
Julia Reynolds [Mon, 30 Nov 2015 18:32:30 +0000 (13:32 -0500)]
Fix print settings crash.
Bug:
25889661
Change-Id: I691b913ce0adc06c29c21ad12d979a0d0e3ad8e7
Julia Reynolds [Mon, 30 Nov 2015 18:00:44 +0000 (18:00 +0000)]
Merge "Split Sound & notification settings."
Jason Monk [Mon, 30 Nov 2015 16:23:43 +0000 (16:23 +0000)]
Merge "Add some more summaries for Settings Home"
Julia Reynolds [Tue, 24 Nov 2015 15:08:14 +0000 (10:08 -0500)]
Split Sound & notification settings.
Bug:
25860852
Change-Id: If88daf6fd50b5abf86fb86f3590361f0118172a1
Jason Monk [Mon, 30 Nov 2015 15:57:47 +0000 (15:57 +0000)]
Merge "Fix various crashes"
Jason Monk [Fri, 20 Nov 2015 19:27:51 +0000 (14:27 -0500)]
Add some more summaries for Settings Home
Change-Id: Iaca8db6bdce87e667832b5b670e4eb027580b668
Jason Monk [Mon, 30 Nov 2015 15:50:15 +0000 (10:50 -0500)]
Fix various crashes
Bug:
25894771
Bug:
25905442
Bug:
25747730
Change-Id: I9680d08514589288eadbe2a50a9ef5e03220a0c1
Geoff Mendal [Mon, 30 Nov 2015 14:19:53 +0000 (06:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48b2c13458992c476fabc9a38f652472efc79490
Auto-generated-cl: translation import
Andrei Stingaceanu [Thu, 26 Nov 2015 11:01:03 +0000 (11:01 +0000)]
Merge "Wire in device owner information into SecuritySettings"
Philip P. Moltmann [Thu, 26 Nov 2015 00:13:01 +0000 (16:13 -0800)]
Change onResume -> onStart in the print settings to update even paused activities.
Change-Id: Ie28de2cd3ba02c3f19d11c61b3dbbce5d33ddb5a
Geoff Mendal [Wed, 25 Nov 2015 14:21:27 +0000 (14:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 25 Nov 2015 14:14:34 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4b7f86727dfac3ed48e8577f7aa08db7adf525f9
Auto-generated-cl: translation import
Julia Reynolds [Wed, 25 Nov 2015 13:58:44 +0000 (08:58 -0500)]
Fix filter indicies.
Bug:
25837105
Change-Id: Ic857f4efdb3d25e38be7b8113cc2256127954e48
Sunny Goyal [Wed, 25 Nov 2015 03:43:23 +0000 (03:43 +0000)]
Merge "Adding the activity icon in wallpaper list"
Makoto Onuki [Thu, 19 Nov 2015 21:47:55 +0000 (13:47 -0800)]
Use explicit APIs to get device owner information
Bug
24676413
Change-Id: Id346c2f01658173c9671edcfd34bc33f1b25faa4
Sunny Goyal [Tue, 24 Nov 2015 22:09:20 +0000 (14:09 -0800)]
Adding the activity icon in wallpaper list
Change-Id: Id31e6dfdfd2f214e6686d21f2aeeb68762de5893
Paul Lawrence [Tue, 24 Nov 2015 20:42:09 +0000 (12:42 -0800)]
Store cooldown state through rotation
Bug:
24361606
Change-Id: Ifc732ce7d157aaa9a21aaedb9e64bca9ae4a56c4
Svetoslav Ganov [Tue, 24 Nov 2015 19:32:51 +0000 (19:32 +0000)]
Merge "Modify system settings: incorrect UI state"
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:
25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
Geoff Mendal [Mon, 23 Nov 2015 14:27:17 +0000 (06:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I294567a73de50ffdaa7d06af081036752a31c0ad
Auto-generated-cl: translation import
Julia Reynolds [Fri, 20 Nov 2015 20:31:18 +0000 (20:31 +0000)]
Merge "Migrate package level notification settings to topic level."
Geoff Mendal [Fri, 20 Nov 2015 20:20:05 +0000 (20:20 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours am:
74e9c3d348 -s ours
am:
9237cc9e6b -s ours
* commit '
9237cc9e6b6f2deda63328323f9bdb47b89bd62f':
Geoff Mendal [Fri, 20 Nov 2015 20:14:39 +0000 (20:14 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours
am:
74e9c3d348 -s ours
* commit '
74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
Julia Reynolds [Thu, 19 Nov 2015 16:33:11 +0000 (11:33 -0500)]
Migrate package level notification settings to topic level.
Bug:
22854014
Change-Id: If0c20bec3b3f8b01b86d195d2e7ff7aa1e15882e
Julia Reynolds [Fri, 20 Nov 2015 14:34:04 +0000 (09:34 -0500)]
Update char limits.
Bug:
25775535
Bug:
25784587
Bug:
25785525
Bug:
25784553
Bug:
25776499
Change-Id: Icfda560f32cfc50bc78ccd548de59606e439db17
Julia Reynolds [Fri, 20 Nov 2015 14:31:44 +0000 (14:31 +0000)]
Merge "Fix crash."
Julia Reynolds [Fri, 20 Nov 2015 14:28:02 +0000 (09:28 -0500)]
Fix crash.
Bug:
25809075
Change-Id: I708a21d65943ba23aa40b4b0f3eb6cb3108e1cf4
Jason Monk [Fri, 20 Nov 2015 13:28:26 +0000 (08:28 -0500)]
Fix strings
Bug:
25784283
Change-Id: I6ad4c92846b182a81967c4d5a1f83ae8a647a1fa
Andrei Stingaceanu [Thu, 12 Nov 2015 12:30:39 +0000 (12:30 +0000)]
Wire in device owner information into SecuritySettings
If the device owner information has been provisioned by device
policy client via the DevicePolicyManager then make the current
user info preference read only and add a summary to specify that
the preference has been disabled by the administrator.
Bug:
22547309
Change-Id: I14952abd2e022607b82ce4361cfa514549243045
Geoff Mendal [Fri, 20 Nov 2015 04:47:34 +0000 (04:47 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours am:
74e9c3d348 -s ours am:
39be1461a8 -s ours am:
bdbd6da522 -s ours
am:
058c71f15d -s ours
* commit '
058c71f15d6d3d340f68f14296526373815efd9b':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 04:44:18 +0000 (04:44 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours am:
74e9c3d348 -s ours am:
39be1461a8 -s ours
am:
bdbd6da522 -s ours
* commit '
bdbd6da522691b4cd7517e12e725676f2ee08983':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:24:46 +0000 (01:24 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours am:
74e9c3d348 -s ours
am:
39be1461a8 -s ours
* commit '
39be1461a876a4442e11dc26cff14ec80273baf0':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:19:50 +0000 (01:19 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours
am:
74e9c3d348 -s ours
* commit '
74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:14:23 +0000 (01:14 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours
am:
75dd183bf7 -s ours
* commit '
75dd183bf7b99c995fe773e7b53a6604a6b53512':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:09:14 +0000 (01:09 +0000)]
Import translations. DO NOT MERGE
am:
2102350ea3 -s ours
* commit '
2102350ea33d8bbed50d9447889876fa295b3e8a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 00:58:46 +0000 (16:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
Jim Miller [Thu, 19 Nov 2015 22:05:08 +0000 (22:05 +0000)]
Merge "Revert "Auto advance fingerprint enrollment when user taps on the sensor""
Jim Miller [Thu, 19 Nov 2015 22:02:11 +0000 (22:02 +0000)]
Revert "Auto advance fingerprint enrollment when user taps on the sensor"
This reverts commit
b3253f1d75cffe24cb92bc40942f05be70bbb564.
Fixes bug
25694018
Change-Id: I29c78e6669db79ff996a1ecdf1cf45cff9ecef69
Jeff Sharkey [Thu, 19 Nov 2015 18:45:41 +0000 (18:45 +0000)]
Merge "Mark this coreApp as being encryptionAware."
Jeff Sharkey [Wed, 18 Nov 2015 17:20:18 +0000 (10:20 -0700)]
Mark this coreApp as being encryptionAware.
Historically, apps marked with "coreApp" were prepared to run in a
limited boot environment, and were critical to booting the device, so
in the new file-based encryption world we're marking these apps with
both "forceDeviceEncrypted" and "encryptionAware" attributes.
Bug:
22358539
Change-Id: Idf9fb8d4b0cc1cd504c9ab7ed770d2cd86d3d506
Julia Reynolds [Thu, 19 Nov 2015 13:41:01 +0000 (13:41 +0000)]
Merge "Remove 'peekable' notification preference."
Maurice Lam [Thu, 19 Nov 2015 02:50:34 +0000 (02:50 +0000)]
Merge "[Fingerprint] Define margins in fingerprint theme"
Maurice Lam [Wed, 18 Nov 2015 23:53:34 +0000 (15:53 -0800)]
[Fingerprint] Define margins in fingerprint theme
Bug:
25755499
Change-Id: Ia03b63316516061484a47bcc2fb4f2c29cee28e4
Julia Reynolds [Wed, 18 Nov 2015 22:05:18 +0000 (17:05 -0500)]
Remove 'peekable' notification preference.
Bug:
22854014
Change-Id: I920185cd8c766436338d38a51663bd5480699f5d
Ben Kwa [Wed, 18 Nov 2015 21:15:36 +0000 (21:15 +0000)]
Merge "Rename ACTION_BROWSE_DOCUMENT_ROOT -> ACTION_BROWSE"
Russell Brenner [Wed, 18 Nov 2015 18:16:55 +0000 (10:16 -0800)]
resolve merge conflicts of
549379737d to master.
Change-Id: I8a6e83948a1915483567734fa99d903acf7e4754
Jason Monk [Wed, 18 Nov 2015 17:55:56 +0000 (12:55 -0500)]
Fix settings crashes on larger devices
Just remove this code until its updated for the new settings home.
Bug:
25750060
Change-Id: I8132598c4b76ef290d180af3d472686b41cb594c
Russell Brenner [Wed, 18 Nov 2015 17:55:40 +0000 (17:55 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93 am:
38e932dc81 am:
8199c3028c am:
bcf3b75f57
am:
4868199d28 -s ours
* commit '
4868199d28e2a6355be779449b7986743698cc82':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Ben Kwa [Wed, 18 Nov 2015 00:05:24 +0000 (16:05 -0800)]
Rename ACTION_BROWSE_DOCUMENT_ROOT -> ACTION_BROWSE
BUG=
23137963
Change-Id: I32e995b4421de4c90faa4e80a095c7df2f7aee25
Russell Brenner [Wed, 18 Nov 2015 17:13:31 +0000 (09:13 -0800)]
resolve merge conflicts of
7285e2c2fc to master.
Change-Id: I56ebcc0dac917791b19ee308eed30bb51267a817
Tony Mantler [Wed, 18 Nov 2015 16:47:38 +0000 (16:47 +0000)]
Merge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"
Jason Monk [Wed, 18 Nov 2015 15:43:45 +0000 (15:43 +0000)]
Merge "Fix DataUsageSummary formatting"
Jason Monk [Wed, 18 Nov 2015 15:08:01 +0000 (15:08 +0000)]
Merge "Summary support for Settings Home"
Geoff Mendal [Wed, 18 Nov 2015 14:17:41 +0000 (14:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Nov 2015 14:17:01 +0000 (06:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I537c355f9faa207c77665a2e7ac91ea5583ef813
Auto-generated-cl: translation import
Julia Reynolds [Wed, 18 Nov 2015 14:10:41 +0000 (14:10 +0000)]
Merge "Apply DND to visual effects."
Sanket Padawe [Wed, 18 Nov 2015 02:03:26 +0000 (02:03 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4 am:
28eca8e8c2 am:
773b8a3c44 am:
60461f3410
am:
5df69b5307
* commit '
5df69b530794e23b0f7d7f7f427e13f5ed727eda':
Uncheck checkbox for contact sharing by default for non carkit devices.
Tony Mantler [Tue, 17 Nov 2015 23:13:29 +0000 (15:13 -0800)]
Move AnimatedImageView and AuthenticatorHelper to SettingsLib
Change-Id: I51d5711b0e626b5e7f83af985d02090480085ac7
Julia Reynolds [Mon, 9 Nov 2015 15:52:17 +0000 (10:52 -0500)]
Apply DND to visual effects.
Bug:
25423508
Change-Id: I00ace3da8a7fea089f4d0fc3f6161452285abb8e
Russell Brenner [Tue, 17 Nov 2015 20:40:50 +0000 (20:40 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e am:
5950ff1d69 am:
2b29501039 am:
f0d538f08d
am:
ebc5086d15
* commit '
ebc5086d15bc1be602dfcd31925000e8c6184f16':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:40:38 +0000 (20:40 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93 am:
38e932dc81 am:
8199c3028c
am:
bcf3b75f57
* commit '
bcf3b75f5732cc270d1974edd2cf1ed48863cb31':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:32:03 +0000 (20:32 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e am:
5950ff1d69 am:
2b29501039
am:
f0d538f08d
* commit '
f0d538f08da7c45e545e51e93373afe38cbd518f':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:31:54 +0000 (20:31 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93 am:
38e932dc81
am:
8199c3028c
* commit '
8199c3028c05cd9c85b6f26fe656518f536bda69':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:23:22 +0000 (20:23 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e am:
5950ff1d69
am:
2b29501039
* commit '
2b295010392c532a47e02e5b003459a50d6d5a62':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:23:06 +0000 (20:23 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93
am:
38e932dc81
* commit '
38e932dc816fe7aff6443bfa5648743f527aa097':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:14:22 +0000 (20:14 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e
am:
5950ff1d69
* commit '
5950ff1d69ca27c09569f40862201ede261c831e':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:14:10 +0000 (20:14 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours
am:
439033dd93
* commit '
439033dd93417b98acff392865166503a507ff30':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:05:54 +0000 (20:05 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b
am:
8e4f6fbc2e
* commit '
8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
OSDN Git Service
