OSDN Git Service
Phil Weaver [Fri, 12 May 2017 22:02:53 +0000 (22:02 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f
am:
5d6d70a50e
Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
Phil Weaver [Fri, 12 May 2017 22:00:23 +0000 (22:00 +0000)]
Don't enable a11y service if scary dialog obscured
am:
9a1b4eb21f
Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
Phil Weaver [Tue, 9 May 2017 17:51:32 +0000 (10:51 -0700)]
Don't enable a11y service if scary dialog obscured
Bug:
38134845
Test: Trivial back-port of ag/
2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
Dmitry Dementyev [Wed, 12 Apr 2017 19:54:06 +0000 (19:54 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours
am:
56dc835f3c -s ours
Change-Id: Iafcd0d4116683e0b40a9f98ef9ccf3d176ec0b32
Dmitry Dementyev [Wed, 12 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours
am:
5f32a5b5f3 -s ours
Change-Id: I608a98d05d77b2e755f516ec60c64484c81437da
Dmitry Dementyev [Wed, 12 Apr 2017 19:44:05 +0000 (19:44 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours
am:
2d9593f8f1 -s ours
Change-Id: Id5ccadb538d8986e86b614d9303a637d6661c482
Dmitry Dementyev [Wed, 12 Apr 2017 19:37:33 +0000 (19:37 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours
am:
13b12fd61d -s ours
Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5
Dmitry Dementyev [Wed, 12 Apr 2017 19:32:36 +0000 (19:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours
am:
22db6274bf -s ours
Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855
Dmitry Dementyev [Wed, 12 Apr 2017 19:26:32 +0000 (19:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a
am:
0c07b38054 -s ours
Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e
am:
bac5163a9a
Change-Id: Ib70241c596aca047a096318eb2026634692f8620
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am:
ea55e6331e
Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
Dmitry Dementyev [Wed, 15 Mar 2017 19:33:05 +0000 (12:33 -0700)]
Add permission check to Intents used by Authenticator Settings.
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.
Bug:
33123882
Test: manual tests
Change-Id: I3ba9c768fc4f8093dcf2eadc17f14c506ec5c327
Merged-In: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
Dmitry Dementyev [Wed, 8 Mar 2017 19:15:40 +0000 (19:15 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c am:
5c4276a258 am:
3a5e567ab9
am:
b7e2545217
Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29
Dmitry Dementyev [Wed, 8 Mar 2017 19:13:10 +0000 (19:13 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c am:
5c4276a258
am:
3a5e567ab9
Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
Dmitry Dementyev [Wed, 8 Mar 2017 19:11:13 +0000 (19:11 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c
am:
5c4276a258
Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
Dmitry Dementyev [Wed, 8 Mar 2017 19:08:40 +0000 (19:08 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev
am:
e24780ed4c
Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1
Dmitry Dementyev [Wed, 8 Mar 2017 03:47:52 +0000 (19:47 -0800)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug:
33123882
Test: manual tests:
Dmitry Dementyev [Tue, 14 Feb 2017 21:15:36 +0000 (13:15 -0800)]
Add permission check to Intents used by Authenticator Settings.
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.
Bug:
33123882
Test: manual tests
Change-Id: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
Maurice Lam [Tue, 6 Sep 2016 23:11:17 +0000 (23:11 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af
am:
d278da7952
Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782
Maurice Lam [Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
am:
c94f2b93af
Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[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
Jason Monk [Fri, 15 Jul 2016 14:03:03 +0000 (14:03 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b
am:
2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
Jason Monk [Fri, 15 Jul 2016 13:59:59 +0000 (13:59 +0000)]
Pre-setup restrictions DO NOT MERGE
am:
e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
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
Svetoslav [Sun, 14 Feb 2016 22:28:25 +0000 (22:28 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state
am:
2c02228ad0
* commit '
2c02228ad0cd7b9d86050647c679843e829819d4':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -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: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
(cherry picked from commit
119d589ea5aa9c2ccc5164279d718a20d0865f20)
Geoff Mendal [Wed, 13 Jan 2016 01:07:32 +0000 (01:07 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours
am:
21e3d54adc -s ours
* commit '
21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:05:38 +0000 (01:05 +0000)]
Import translations. DO NOT MERGE
am:
6a52aca8ea -s ours
* commit '
6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 00:44:04 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
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
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
Russell Brenner [Tue, 17 Nov 2015 20:05:43 +0000 (20:05 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 19:57:00 +0000 (19:57 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed
am:
afe5eada5b
* commit '
afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:56:48 +0000 (19:56 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 19:53:17 +0000 (19:53 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
am:
56d630a3ed
* commit '
56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:51:09 +0000 (19:51 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
am:
14bf226c79
* commit '
14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:29:12 +0000 (01:29 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am:
f0ff1631de
am:
2075d98be6
* commit '
2075d98be6199032d0bdf65d9e1789153e12fb66':
Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:22:41 +0000 (01:22 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
am:
f0ff1631de
* commit '
f0ff1631dee1d988151f8260e6c65ff836a40e80':
Preserve FRP lock if wiped during SUW
Sanket Padawe [Tue, 17 Nov 2015 01:16:41 +0000 (01:16 +0000)]
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.
Russell Brenner [Tue, 17 Nov 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
Russell Brenner [Tue, 17 Nov 2015 01:13:55 +0000 (01:13 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
Sanket Padawe [Tue, 17 Nov 2015 01:12:09 +0000 (01:12 +0000)]
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.
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
[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
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
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
Sanket Padawe [Thu, 12 Nov 2015 23:57:48 +0000 (23:57 +0000)]
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.
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
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
dbc47fb262a4273417d99dabab757854aa3b0eaf)
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
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
Russell Brenner [Mon, 9 Nov 2015 19:35:42 +0000 (11:35 -0800)]
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
Jason Monk [Mon, 9 Nov 2015 22:31:51 +0000 (22:31 +0000)]
Null check queryIntentServices
am:
a4c9492b50
* commit '
a4c9492b50b742488a6a92abdc290b5ada3c004b':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 21:56:46 +0000 (16:56 -0500)]
Null check queryIntentServices
Bug:
25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
Dianne Hackborn [Fri, 30 Oct 2015 17:20:13 +0000 (17:20 +0000)]
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
Dianne Hackborn [Fri, 30 Oct 2015 17:16:20 +0000 (17:16 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
Dianne Hackborn [Fri, 30 Oct 2015 00:32:28 +0000 (17:32 -0700)]
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
Dianne Hackborn [Thu, 29 Oct 2015 23:39:39 +0000 (23:39 +0000)]
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
Dianne Hackborn [Thu, 29 Oct 2015 23:36:14 +0000 (23:36 +0000)]
Merge "Fix issue #
25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
Dianne Hackborn [Thu, 29 Oct 2015 20:34:51 +0000 (13:34 -0700)]
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
Geoff Mendal [Wed, 28 Oct 2015 14:00:31 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
260d90a102 -s ours
* commit '
260d90a102b3a0d7ba51c5bf73d34291ef2f4910':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 13:55:41 +0000 (08:55 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 14:13:23 +0000 (14:13 +0000)]
Import translations. DO NOT MERGE
am:
c338bacb59 -s ours
* commit '
c338bacb59b13bed45239a587e3429b4bed00a71':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:03:05 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
Jason Monk [Thu, 22 Oct 2015 23:12:02 +0000 (23:12 +0000)]
Fix crash in Settings from uninstall
am:
6e2e8e17cf
* commit '
6e2e8e17cfea09548067baa8b361dbc31dce385c':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 22:32:08 +0000 (15:32 -0700)]
Fix crash in Settings from uninstall
Bug:
25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
Geoff Mendal [Wed, 21 Oct 2015 14:48:15 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE
am:
a489856def -s ours
* commit '
a489856def386e52f3507370f5b504841bab7a61':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:05:23 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
Jason Monk [Wed, 21 Oct 2015 01:43:06 +0000 (01:43 +0000)]
Allow access to permissions, even if app has none
am:
36866c8e84
* commit '
36866c8e84acd26e82b072f2d39106d0e58e6a84':
Allow access to permissions, even if app has none
Jason Monk [Tue, 20 Oct 2015 23:38:58 +0000 (19:38 -0400)]
Allow access to permissions, even if app has none
Bug:
24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
Michael Wright [Tue, 20 Oct 2015 17:35:19 +0000 (17:35 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
am:
66b6591d4c
* commit '
66b6591d4c14400a18573a11880db16bb26ab80a':
Always show pairing dialog for device-specific keyboard.
Jeff Sharkey [Tue, 20 Oct 2015 17:33:50 +0000 (17:33 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev
am:
2fcbdb7bb6
* commit '
2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 17:32:47 +0000 (17:32 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
am:
29b0ea2dbf
* commit '
29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:23:40 +0000 (17:23 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:52 +0000 (17:21 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev
Jeff Sharkey [Tue, 20 Oct 2015 17:21:43 +0000 (17:21 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
Geoff Mendal [Tue, 20 Oct 2015 11:52:42 +0000 (11:52 +0000)]
Import translations. DO NOT MERGE
am:
3a7368e9c3 -s ours
* commit '
3a7368e9c32af8c3245c8effc98de9e75f90f27a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 04:22:01 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
Jason Monk [Tue, 20 Oct 2015 02:05:14 +0000 (02:05 +0000)]
Hide SIM and IMEI for wifi only devices
am:
417a0500c3
* commit '
417a0500c3d7e14013751dbe62791487b033ee72':
Hide SIM and IMEI for wifi only devices
Jeff Sharkey [Tue, 20 Oct 2015 00:22:05 +0000 (17:22 -0700)]
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
Jason Monk [Mon, 19 Oct 2015 23:48:15 +0000 (19:48 -0400)]
Hide SIM and IMEI for wifi only devices
Bug:
24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
Jeff Sharkey [Mon, 19 Oct 2015 23:41:53 +0000 (16:41 -0700)]
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
Geoff Mendal [Mon, 19 Oct 2015 14:28:59 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
84c62dde3d -s ours
* commit '
84c62dde3d737e0cc194a24e76dbdac9e8c75170':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:27:20 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 14:25:38 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 13:09:13 +0000 (13:09 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
am:
862568de0d -s ours
* commit '
862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:04:28 +0000 (13:04 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
99131cf64253cf997d8ee6e356843e376a141846':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]
am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
Jason Monk [Fri, 16 Oct 2015 16:41:22 +0000 (16:41 +0000)]
am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
cdcba9ce5f44cf4cad9e308919272db4e15e9717':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)]
Merge "Fix crashes in Settings" into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:18:41 +0000 (16:18 +0000)]
am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
de005547bae3799265fdad8f61720a82241f4b07':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:14:47 +0000 (16:14 +0000)]
Merge "Bail if activity was destroyed." into mnc-dr-dev
Jason Monk [Fri, 16 Oct 2015 14:13:53 +0000 (10:13 -0400)]
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
Amit Mahajan [Wed, 14 Oct 2015 23:37:32 +0000 (23:37 +0000)]
am
1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit '
1704ca968d4566218f159817625f849c1dc34d96':
Change to add user_visible field to Carriers table.
Amit Mahajan [Wed, 14 Oct 2015 23:33:01 +0000 (23:33 +0000)]
Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
Jeff Sharkey [Wed, 14 Oct 2015 21:45:52 +0000 (14:45 -0700)]
Bail if activity was destroyed.
Bug:
24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
Erik Kline [Wed, 14 Oct 2015 17:42:15 +0000 (17:42 +0000)]
am
583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '
583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
Unconfigure the lockdown VPN if the user forgets its profile.
Erik Kline [Wed, 14 Oct 2015 17:37:52 +0000 (17:37 +0000)]
Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
OSDN Git Service
