OSDN Git Service
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
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
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
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:47:46 +0000 (01:47 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am:
f0ff1631de am:
2075d98be6 am:
7d44fe6fdb
am:
6a7ff3186b
* commit '
6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d':
Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:37:51 +0000 (01:37 +0000)]
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
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
Sanket Padawe [Tue, 17 Nov 2015 01:28:09 +0000 (01:28 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4 am:
28eca8e8c2 am:
773b8a3c44
am:
60461f3410
* commit '
60461f3410151716d34d87ae1ca4ad00620b72eb':
Uncheck checkbox for contact sharing by default for non carkit devices.
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:22:25 +0000 (01:22 +0000)]
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.
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
Robin Lee [Fri, 13 Nov 2015 14:11:32 +0000 (14:11 +0000)]
Merge "VPN settings: grey out policy-restricted menus" am:
ee4808d37b
am:
905829393d
* commit '
905829393d85db3e5d3f4b18a37c5da7184e6a63':
VPN settings: grey out policy-restricted menus
Robin Lee [Fri, 13 Nov 2015 14:08:52 +0000 (14:08 +0000)]
Merge "VPN settings: grey out policy-restricted menus"
am:
ee4808d37b
* commit '
ee4808d37b955299501e9b753cc7bb19877d4f83':
VPN settings: grey out policy-restricted menus
Robin Lee [Fri, 13 Nov 2015 14:07:05 +0000 (14:07 +0000)]
Merge "VPN settings: grey out policy-restricted menus"
Robin Lee [Fri, 16 Oct 2015 11:37:59 +0000 (12:37 +0100)]
VPN settings: grey out policy-restricted menus
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.
Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
Sanket Padawe [Fri, 13 Nov 2015 00:07:06 +0000 (00:07 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
dbc47fb262 am:
0ad16831ee
am:
df5b8c5b65
* commit '
df5b8c5b65050f08c36c1610d856282ab05fae5f':
Uncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Fri, 13 Nov 2015 00:02:30 +0000 (00:02 +0000)]
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.
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:40:33 +0000 (22:40 +0000)]
Null check queryIntentServices am:
a4c9492b50 am:
e27cada8c4
am:
e198f7b84f
* commit '
e198f7b84fde2b3ca3f0e0c9195166b06363850e':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 22:36:21 +0000 (22:36 +0000)]
Null check queryIntentServices am:
a4c9492b50
am:
e27cada8c4
* commit '
e27cada8c49c8aec2463c352faf5211502b1b372':
Null check queryIntentServices
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
Baligh Uddin [Thu, 5 Nov 2015 19:40:21 +0000 (19:40 +0000)]
Import translations. DO NOT MERGE
am:
7b9f79bb6e -s ours
* commit '
7b9f79bb6e6c72adae3e9674617b5b9c45c769bd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Nov 2015 20:11:39 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I38ff46207ad622dc25f4cbbf6445ceac1dcfedb7
Jason Monk [Wed, 4 Nov 2015 15:02:47 +0000 (15:02 +0000)]
Merge "Don\'t show MIDI USB option if not supported" am:
c2a9cd03f7
am:
92aafd3ed5
* commit '
92aafd3ed5391eb5b172c54e6ea820dd36110c99':
Don't show MIDI USB option if not supported
Jason Monk [Wed, 4 Nov 2015 14:56:04 +0000 (14:56 +0000)]
Merge "Don\'t show MIDI USB option if not supported"
am:
c2a9cd03f7
* commit '
c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
Don't show MIDI USB option if not supported
Jason Monk [Wed, 4 Nov 2015 14:43:11 +0000 (14:43 +0000)]
Merge "Don't show MIDI USB option if not supported"
Zoran Jovanovic [Wed, 4 Nov 2015 13:00:03 +0000 (14:00 +0100)]
Don't show MIDI USB option if not supported
If device doesn't support MIDI, don't show MIDI in "Use USB for" menu
when USB cable is connected.
(Selecting MIDI will crash the Settings app.)
Change-Id: I60f4cbb6357f162fecb574cdb6766cf5ed92e78e
Dianne Hackborn [Fri, 30 Oct 2015 17:27:44 +0000 (17:27 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
3b4e4dd91d am:
a42bad972c
am:
44643bad26
* commit '
44643bad268fa65d8a5d95055a8a9c2c4bf86fdf':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:24:34 +0000 (17:24 +0000)]
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
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:46:20 +0000 (23:46 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
508559d076 am:
68954d930d
am:
2af9128966
* commit '
2af9128966ee855d6c8e06479562cb141c625511':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:43:04 +0000 (23:43 +0000)]
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
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:10:08 +0000 (14:10 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours am:
04817defc9 -s ours
am:
fe5582a26b -s ours
* commit '
fe5582a26b461482c51a163b76c2283ae96116eb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:05:28 +0000 (14:05 +0000)]
Import translations. DO NOT MERGE am:
260d90a102 -s ours
am:
04817defc9 -s ours
* commit '
04817defc935af871ec90b971f61d4b31d28c97d':
Import translations. DO NOT MERGE
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:22:41 +0000 (14:22 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours am:
884a8bbe78 -s ours
am:
436fcc47fc -s ours
* commit '
436fcc47fce217f4c2b6301fe94fa87ffd6c0dbe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:17:02 +0000 (14:17 +0000)]
Import translations. DO NOT MERGE am:
c338bacb59 -s ours
am:
884a8bbe78 -s ours
* commit '
884a8bbe7872e8d7aa94f854e4057d2d073cd09a':
Import translations. DO NOT MERGE
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:42:14 +0000 (23:42 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf am:
34d6ea560d
am:
eccc9b3962
* commit '
eccc9b39626c525763e5590728f413e4d7ff8cf5':
Fix crash in Settings from uninstall
Jason Monk [Thu, 22 Oct 2015 23:37:48 +0000 (23:37 +0000)]
Fix crash in Settings from uninstall am:
6e2e8e17cf
am:
34d6ea560d
* commit '
34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
Fix crash in Settings from uninstall
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 16:47:13 +0000 (16:47 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours am:
f3ad526200 -s ours
am:
79e81bca9c -s ours
* commit '
79e81bca9c11b35bbc4522fbe8117dc0b425ccc7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 21 Oct 2015 14:59:01 +0000 (14:59 +0000)]
Import translations. DO NOT MERGE am:
a489856def -s ours
am:
f3ad526200 -s ours
* commit '
f3ad5262003947120243736851ff5dce7ae7635a':
Import translations. DO NOT MERGE
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 02:20:21 +0000 (02:20 +0000)]
Allow access to permissions, even if app has none am:
36866c8e84 am:
6fde534148
am:
47db2ba628
* commit '
47db2ba62840135894cf139886c68e63a4497626':
Allow access to permissions, even if app has none
Jason Monk [Wed, 21 Oct 2015 01:46:11 +0000 (01:46 +0000)]
Allow access to permissions, even if app has none am:
36866c8e84
am:
6fde534148
* commit '
6fde534148c3f93b6362d4927270f81048a6bef3':
Allow access to permissions, even if app has none
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
Jeff Sharkey [Tue, 20 Oct 2015 18:34:46 +0000 (18:34 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp
Jeff Sharkey [Tue, 20 Oct 2015 18:34:40 +0000 (18:34 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6 am:
82839c8073
am:
0b07ce50a7
* commit '
0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.
Michael Wright [Tue, 20 Oct 2015 18:34:24 +0000 (18:34 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
am:
98ec49dd6c
* commit '
98ec49dd6c3105e342cf8e6c4fb5eb6168924b13':
Michael Wright [Tue, 20 Oct 2015 18:34:11 +0000 (18:34 +0000)]
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am:
66b6591d4c am:
6e957d6b42
am:
94a5587ed6
* commit '
94a5587ed664fa2e3996534d9ccf41394a1f131e':
Always show pairing dialog for device-specific keyboard.
Jeff Sharkey [Tue, 20 Oct 2015 18:32:34 +0000 (18:32 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6 am:
82839c8073
am:
0b07ce50a7
* commit '
0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 18:30:09 +0000 (18:30 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf am:
a8bd650e81
am:
10338550c4
* commit '
10338550c42421595896377f68545df1f8a93644':
Clamp large data usage values.
Michael Wright [Tue, 20 Oct 2015 17:54:53 +0000 (17:54 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
Michael Wright [Tue, 20 Oct 2015 17:54:46 +0000 (17:54 +0000)]
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.
Michael Wright [Tue, 20 Oct 2015 17:54:29 +0000 (17:54 +0000)]
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.
Jeff Sharkey [Tue, 20 Oct 2015 17:49:25 +0000 (17:49 +0000)]
Merge "Hide empty data usage cycles." into mnc-dr-dev am:
2fcbdb7bb6
am:
82839c8073
* commit '
82839c8073ff358e036c7ae54e52041e4a51738e':
Hide empty data usage cycles.
Jeff Sharkey [Tue, 20 Oct 2015 17:48:14 +0000 (17:48 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf
am:
a8bd650e81
* commit '
a8bd650e810178358251e3099f949af8422d5a24':
Clamp large data usage values.
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.
OSDN Git Service
