Maurice Lam
94a0fa5759
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am: c94f2b93af
...
am: d278da7952
Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782
2016-09-06 23:11:17 +00:00
Maurice Lam
d278da7952
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
...
am: c94f2b93af
Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656
2016-09-06 23:08:45 +00:00
Maurice Lam
c94f2b93af
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
...
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.
Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
2016-09-02 16:53:52 -07:00
Jason Monk
68d53c0481
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
...
am: 2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
2016-07-15 14:03:03 +00:00
Jason Monk
2d21d1b9cf
Pre-setup restrictions DO NOT MERGE
...
am: e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
2016-07-15 13:59:59 +00:00
Jason Monk
e6ad6e866b
Pre-setup restrictions DO NOT MERGE
...
- Prevent external tiles from system apps
- Don't let user settings run
- Disable help
Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
2016-06-30 12:50:44 -04:00
Svetoslav
5527ac9cf2
DO NOT MERGE Modify system settings: incorrect UI state
...
am: 2c02228ad0
* commit '2c02228ad0cd7b9d86050647c679843e829819d4':
DO NOT MERGE Modify system settings: incorrect UI state
2016-02-14 22:28:25 +00:00
Svetoslav
2c02228ad0
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: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d
)
(cherry picked from commit 119d589ea5
)
2016-02-12 20:25:18 +00:00
Geoff Mendal
b994c93600
Import translations. DO NOT MERGE am: 6a52aca8ea
-s ours
...
am: 21e3d54adc
-s ours
* commit '21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
2016-01-13 01:07:32 +00:00
Geoff Mendal
21e3d54adc
Import translations. DO NOT MERGE
...
am: 6a52aca8ea
-s ours
* commit '6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
2016-01-13 01:05:38 +00:00
Geoff Mendal
6a52aca8ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
2016-01-12 16:44:04 -08:00
Geoff Mendal
75dd183bf7
Import translations. DO NOT MERGE
...
am: 2102350ea3
-s ours
* commit '2102350ea33d8bbed50d9447889876fa295b3e8a':
Import translations. DO NOT MERGE
2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
2015-11-20 01:02:07 +00:00
Russell Brenner
f0d538f08d
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
2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c
[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
2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039
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
2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81
[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
2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b
...
am: 8e4f6fbc2e
* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1
...
am: 6967df6421
-s ours
* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
...
am: afe5eada5b
* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
...
am: 97759fa8d1
* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b
Merge "Block developer settings during SUW" into lmp-mr1-dev
...
am: 56d630a3ed
* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
am: 14bf226c79
* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
2015-11-17 19:51:09 +00:00
Russell Brenner
7d44fe6fdb
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
...
am: 2075d98be6
* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
Preserve FRP lock if wiped during SUW
2015-11-17 01:29:12 +00:00
Russell Brenner
2075d98be6
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
...
am: f0ff1631de
* commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80':
Preserve FRP lock if wiped during SUW
2015-11-17 01:22:41 +00:00
Sanket Padawe
773b8a3c44
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4
...
am: 28eca8e8c2
* commit '28eca8e8c2d9e11a9f304e85ff3a34819edd68a9':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:16:41 +00:00
Russell Brenner
f0ff1631de
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed
Merge "Block developer settings during SUW" into lmp-mr1-dev
2015-11-17 01:13:55 +00:00
Sanket Padawe
28eca8e8c2
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: 98f11fd1a4
* commit '98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-17 01:12:09 +00:00
Russell Brenner
14bf226c79
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:10:44 +00:00
Russell Brenner
de4fc8eb2a
Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:08:51 +00:00
Sanket Padawe
0ad16831ee
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: dbc47fb262
* commit 'dbc47fb262a4273417d99dabab757854aa3b0eaf':
Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-12 23:57:48 +00:00
Sanket Padawe
98f11fd1a4
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit dbc47fb262
)
2015-11-12 23:54:06 +00:00
Sanket Padawe
dbc47fb262
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
2015-11-12 14:55:51 -08:00
Russell Brenner
4836ab6df4
Block developer settings during SUW
...
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
2015-11-10 12:15:48 -08:00
Jason Monk
e27cada8c4
Null check queryIntentServices
...
am: a4c9492b50
* commit 'a4c9492b50b742488a6a92abdc290b5ada3c004b':
Null check queryIntentServices
2015-11-09 22:31:51 +00:00
Jason Monk
a4c9492b50
Null check queryIntentServices
...
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
2015-11-09 16:56:46 -05:00
Dianne Hackborn
a42bad972c
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
...
am: 3b4e4dd91d
* commit '3b4e4dd91d416c93fdc0326e54469ceabb8281ab':
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:20:13 +00:00
Dianne Hackborn
3b4e4dd91d
Merge "Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS" into mnc-dr-dev
2015-10-30 17:16:20 +00:00
Dianne Hackborn
b6c7b05056
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
...
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).
Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
2015-10-29 17:32:28 -07:00
Dianne Hackborn
68954d930d
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
...
am: 508559d076
* commit '508559d0760596509f07fa56371c6e18d8bd9559':
Fix issue #25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:39:39 +00:00
Dianne Hackborn
508559d076
Merge "Fix issue #25371736 : Don't include z-ram allocations in Android OS" into mnc-dr-dev
2015-10-29 23:36:14 +00:00
Dianne Hackborn
30bbd902dd
Fix issue #25371736 : Don't include z-ram allocations in Android OS
...
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.
Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
2015-10-29 15:43:21 -07:00
Geoff Mendal
04817defc9
Import translations. DO NOT MERGE
...
am: 260d90a102
-s ours
* commit '260d90a102b3a0d7ba51c5bf73d34291ef2f4910':
Import translations. DO NOT MERGE
2015-10-28 14:00:31 +00:00
Geoff Mendal
260d90a102
Import translations. DO NOT MERGE
...
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
2015-10-28 08:55:41 -05:00
Geoff Mendal
884a8bbe78
Import translations. DO NOT MERGE
...
am: c338bacb59
-s ours
* commit 'c338bacb59b13bed45239a587e3429b4bed00a71':
Import translations. DO NOT MERGE
2015-10-26 14:13:23 +00:00
Geoff Mendal
c338bacb59
Import translations. DO NOT MERGE
...
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
2015-10-26 07:03:05 -07:00
Jason Monk
34d6ea560d
Fix crash in Settings from uninstall
...
am: 6e2e8e17cf
* commit '6e2e8e17cfea09548067baa8b361dbc31dce385c':
Fix crash in Settings from uninstall
2015-10-22 23:12:02 +00:00
Jason Monk
6e2e8e17cf
Fix crash in Settings from uninstall
...
Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
2015-10-22 22:58:50 +00:00
Geoff Mendal
f3ad526200
Import translations. DO NOT MERGE
...
am: a489856def
-s ours
* commit 'a489856def386e52f3507370f5b504841bab7a61':
Import translations. DO NOT MERGE
2015-10-21 14:48:15 +00:00