PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,169 Commits 1 Branch 0 Tags
bcf3b75f5732cc270d1974edd2cf1ed48863cb31
Commit Graph

22169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Brenner
bcf3b75f57 [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
 2015-11-17 20:31:54 +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
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
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
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
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
6a7ff3186b Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 
am: 7d44fe6fdb

* commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
  Preserve FRP lock if wiped during SUW
 2015-11-17 01:37:51 +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
60461f3410 Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2 
am: 773b8a3c44

* commit '773b8a3c4422ab9daf7adb62895568852b43882e':
  Uncheck checkbox for contact sharing by default for non carkit devices.
 2015-11-17 01:22:25 +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
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
df5b8c5b65 Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 
am: 0ad16831ee

* commit '0ad16831ee2e2029a0fc2891c8007505bb9779cd':
  Uncheck checkbox for contact sharing by default for non carkit devices.
 2015-11-13 00:02:30 +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
Jason Monk
e198f7b84f Null check queryIntentServices am: a4c9492b50 
am: e27cada8c4

* commit 'e27cada8c49c8aec2463c352faf5211502b1b372':
  Null check queryIntentServices
 2015-11-09 22:36:21 +00: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
44643bad26 Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d 
am: a42bad972c

* commit 'a42bad972ca44f52ac84b3139198acc11dec0d4f':
  Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-30 17:24:34 +00: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
2af9128966 Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076 
am: 68954d930d

* commit '68954d930d0a583c7150e1a3959d5a798b8e5f34':
  Fix issue #25371736: Don't include z-ram allocations in Android OS
 2015-10-29 23:43:04 +00: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
fe5582a26b Import translations. DO NOT MERGE am: 260d90a102 -s ours 
am: 04817defc9  -s ours

* commit '04817defc935af871ec90b971f61d4b31d28c97d':
  Import translations. DO NOT MERGE
 2015-10-28 14:05:28 +00: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
436fcc47fc Import translations. DO NOT MERGE am: c338bacb59 -s ours 
am: 884a8bbe78  -s ours

* commit '884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
  Import translations. DO NOT MERGE
 2015-10-26 14:17:02 +00: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
eccc9b3962 Fix crash in Settings from uninstall am: 6e2e8e17cf 
am: 34d6ea560d

* commit '34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
  Fix crash in Settings from uninstall
 2015-10-22 23:37:48 +00: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
79e81bca9c Import translations. DO NOT MERGE am: a489856def -s ours 
am: f3ad526200  -s ours

* commit 'f3ad5262003947120243736851ff5dce7ae7635a':
  Import translations. DO NOT MERGE
 2015-10-21 14:59:01 +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
Geoff Mendal
a489856def Import translations. DO NOT MERGE 
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
 2015-10-21 07:05:23 -07:00
Jason Monk
47db2ba628 Allow access to permissions, even if app has none am: 36866c8e84 
am: 6fde534148

* commit '6fde534148c3f93b6362d4927270f81048a6bef3':
  Allow access to permissions, even if app has none
 2015-10-21 01:46:11 +00:00
Jason Monk
6fde534148 Allow access to permissions, even if app has none 
am: 36866c8e84

* commit '36866c8e84acd26e82b072f2d39106d0e58e6a84':
  Allow access to permissions, even if app has none
 2015-10-21 01:43:06 +00:00
Jason Monk
36866c8e84 Allow access to permissions, even if app has none 
Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
 2015-10-20 19:38:58 -04:00
Michael Wright
98ec49dd6c Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev 2015-10-20 17:54:53 +00:00
Michael Wright
94a5587ed6 Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c 
am: 6e957d6b42

* commit '6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
  Always show pairing dialog for device-specific keyboard.
 2015-10-20 17:54:46 +00:00
Michael Wright
ad1f744417 Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c 
am: 6e957d6b42

* commit '6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
  Always show pairing dialog for device-specific keyboard.
 2015-10-20 17:54:29 +00:00
Jeff Sharkey
0b07ce50a7 Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 
am: 82839c8073

* commit '82839c8073ff358e036c7ae54e52041e4a51738e':
  Hide empty data usage cycles.
 2015-10-20 17:49:25 +00:00
Jeff Sharkey
10338550c4 Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf 
am: a8bd650e81

* commit 'a8bd650e810178358251e3099f949af8422d5a24':
  Clamp large data usage values.
 2015-10-20 17:48:14 +00:00