PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,270 Commits 1 Branch 0 Tags
26f4aceece67b6607d7d3244aa7b756d6843f648
Commit Graph

21270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
a4c9492b50 Null check queryIntentServices 
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
 2015-11-09 16:56:46 -05: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
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
260d90a102 Import translations. DO NOT MERGE 
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
 2015-10-28 08:55:41 -05: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
6e2e8e17cf Fix crash in Settings from uninstall 
Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
 2015-10-22 22:58:50 +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
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
66b6591d4c Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev 2015-10-20 17:23:40 +00:00
Jeff Sharkey
2fcbdb7bb6 Merge "Hide empty data usage cycles." into mnc-dr-dev 2015-10-20 17:21:52 +00:00
Jeff Sharkey
29b0ea2dbf Merge "Clamp large data usage values." into mnc-dr-dev 2015-10-20 17:21:43 +00:00
Geoff Mendal
3a7368e9c3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
 2015-10-19 21:22:01 -07:00
Jeff Sharkey
02551ecd2e Hide empty data usage cycles. 
When building list of historical data usage cycles, omit cycles
that don't contain any data usage.  A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between.  Now we hide empty cycles to keep
things clean.

Bug: 18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
 2015-10-19 17:28:04 -07:00
Jason Monk
417a0500c3 Hide SIM and IMEI for wifi only devices 
Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
 2015-10-19 20:02:11 -04:00
Jeff Sharkey
3105ea30d4 Clamp large data usage values. 
Without clamping, they can wrap around to negative values and cause
all sorts of havok.  1TB ought to be enough for anyone: that's 3Mbps
for a solid month.

Bug: 24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
 2015-10-19 16:41:53 -07:00
Geoff Mendal
84c62dde3d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-19 14:27:20 +00:00
Geoff Mendal
7f62f29b24 Import translations. DO NOT MERGE 
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
 2015-10-19 07:25:38 -07:00
Geoff Mendal
862568de0d am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE 
* commit '99131cf64253cf997d8ee6e356843e376a141846':
  Import translations. DO NOT MERGE
 2015-10-19 13:04:28 +00:00
Geoff Mendal
99131cf642 am f191953c: (-s ours) Import translations. DO NOT MERGE 
* commit 'f191953c77af3c5b78e576a430577aaf050aa5f1':
  Import translations. DO NOT MERGE
 2015-10-19 13:01:28 +00:00
Geoff Mendal
f191953c77 Import translations. DO NOT MERGE 
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
 2015-10-19 05:21:10 -07:00
Jason Monk
cdcba9ce5f Merge "Fix crashes in Settings" into mnc-dr-dev 2015-10-16 16:33:56 +00:00
Jeff Sharkey
de005547ba Merge "Bail if activity was destroyed." into mnc-dr-dev 2015-10-16 16:14:47 +00:00
Jason Monk
77b11fa470 Fix crashes in Settings 
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.

Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
 2015-10-16 10:13:53 -04:00
Amit Mahajan
1704ca968d Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 2015-10-14 23:33:01 +00:00
Jeff Sharkey
cabb62faf3 Bail if activity was destroyed. 
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
 2015-10-14 14:45:52 -07:00
Erik Kline
583deb524b Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 2015-10-14 17:37:52 +00:00
Geoff Mendal
74d90b3e4e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-14 14:35:49 +00:00
Geoff Mendal
d71db4f50c Import translations. DO NOT MERGE 
Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import
 2015-10-14 07:34:20 -07:00
Geoff Mendal
0884f09acf am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
  Import translations. DO NOT MERGE
 2015-10-14 12:59:54 +00:00
Geoff Mendal
67b0ffc88b am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
  Import translations. DO NOT MERGE
 2015-10-14 12:53:54 +00:00
Geoff Mendal
8b6b589dbd am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit 'cec2a65a98161c6c69e373647f03745c59246097':
  Import translations. DO NOT MERGE
 2015-10-14 12:49:34 +00:00
Geoff Mendal
cec2a65a98 am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE
 2015-10-14 12:45:51 +00:00
Geoff Mendal
26bb544ff2 am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE
 2015-10-14 12:40:45 +00:00
Geoff Mendal
46eb1857b6 Import translations. DO NOT MERGE 
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
 2015-10-14 05:30:54 -07:00
Geoff Mendal
d1ba8f73ce am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91':
  Import translations. DO NOT MERGE
 2015-10-14 12:30:14 +00:00