Zach Jang
00721b4afa
am c87ceb7e
: am 6ceb2ba9
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-21 18:58:12 +00:00
Zach Jang
c87ceb7ec1
am 6ceb2ba9
: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:18 +00:00
Zach Jang
6ceb2ba9b8
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
...
CL#3/3
b/23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
2015-09-14 14:03:12 -07:00
Sanket Padawe
19336da3f7
am ac2347c0
: am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:49:53 +00:00
Sanket Padawe
ac2347c0bf
am 158fa952
: am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 19:25:06 +00:00
Sanket Padawe
158fa95218
am df9b13af
: am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 17:08:45 +00:00
Sanket Padawe
df9b13af9b
am 74d85949
: am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:44:58 +00:00
Sanket Padawe
74d8594950
am e05f7143
: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
Check for special char when renaming device for Wi-Fi direct.
2015-07-29 16:15:17 +00:00
Sanket Padawe
e05f714315
Check for special char when renaming device for Wi-Fi direct.
...
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef3
)
2015-07-28 16:09:59 +00:00
Stuart Scott
53eec9faad
Fix sim notifications.
...
bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
2015-03-25 18:07:45 +00:00
Sanket Padawe
4e838ca96e
Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
2015-02-26 21:57:50 +00:00
Lifu Tang
1bbd8814c6
Removed extra "your" from device only subtext
...
Bug: 19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2
2015-02-24 15:25:27 -08:00
Sanket Padawe
8f77f435d8
Use TelephonyManager api to get SPN of sim to display in UI.
...
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
2015-02-24 13:30:33 -08:00
Sanket Padawe
7e21fa5ab4
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
...
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
2015-02-12 12:39:34 -08:00
Sanket Padawe
4decadbc44
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
2015-02-03 18:10:47 +00:00
Sanket Padawe
ffd96559e7
Remove SimDialogActivity from recents app list.
...
Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
2015-02-02 16:46:55 -08:00
Andres Morales
2e75203a6e
Use getDefaultAdapter instead of getNfcAdapter
...
getNfcAdapter can throw an exception if NFC is not
available
Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
2015-02-02 13:39:57 -08:00
Robin Lee
528c64e205
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
2015-02-02 11:22:02 +00:00
Sanket Padawe
a46c7236b6
Change to fit color name text on color selection spinner in settings.
...
Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
2015-01-30 11:23:22 -08:00
Robin Lee
635426b0a7
Repair broken keychain wifi_uid logic
...
Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.
Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976
2015-01-30 19:00:45 +00:00
Sanket Padawe
ab84518009
Remove sim status and imei for secondary user.
...
Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
2015-01-29 17:19:26 -08:00
Fyodor Kupolov
c4dba4513b
am b26bec1a
: am 83930bc3
: am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1
...
* commit 'b26bec1a6fd7c03d667d7fa83bffd0ee8afb7b3e':
2015-01-29 20:46:13 +00:00
Fyodor Kupolov
b26bec1a6f
am 83930bc3
: am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1
...
* commit '83930bc3ee26001e18a3f708e05c0e967e21e559':
2015-01-29 20:39:11 +00:00
Fyodor Kupolov
83930bc3ee
am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started automerge: 3a3ff59
...
automerge: 5b2b7e1
* commit '5b2b7e189766e889118059902a15a4ce2c127e9d':
2015-01-29 20:34:29 +00:00
Fyodor Kupolov
ac840cd91b
am f400051c
: am 9e432a69
: am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started automerge: 57641a8
automerge: 0738bae
...
* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':
2015-01-29 19:42:06 +00:00
Fyodor Kupolov
5b2b7e1897
am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
automerge: 3a3ff59
* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
Added a check if a custom activity can be started
2015-01-29 19:39:59 +00:00
Fyodor Kupolov
f400051c3a
am 9e432a69
: am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started automerge: 57641a8
automerge: 0738bae
...
* commit '9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
2015-01-29 19:35:11 +00:00
Fyodor Kupolov
9e432a698b
am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started automerge: 57641a8
...
automerge: 0738bae
* commit '0738bae9164b150ce81b8cba57be9105a0308115':
2015-01-29 19:29:20 +00:00
Fyodor Kupolov
037c811844
am 6355e115
: am 77a2e3d6
: am 3a3ff591
: am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit '6355e1152ab29735721c40cfab6431a65341218b':
Added a check if a custom activity can be started
2015-01-29 19:16:10 +00:00
Fyodor Kupolov
6355e1152a
am 77a2e3d6
: am 3a3ff591
: am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit '77a2e3d62574be9cf0aae17231fd423a7a399984':
Added a check if a custom activity can be started
2015-01-29 19:09:23 +00:00
Fyodor Kupolov
77a2e3d625
am 3a3ff591
: am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit '3a3ff591976ef7503d382be2897cad5710cd80e7':
Added a check if a custom activity can be started
2015-01-29 19:03:01 +00:00
Fyodor Kupolov
3a3ff59197
am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
Added a check if a custom activity can be started
2015-01-29 18:57:22 +00:00
Fyodor Kupolov
a6c8a0e66d
am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
Added a check if a custom activity can be started
2015-01-29 18:50:43 +00:00
Fyodor Kupolov
d8b606b81a
am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
Added a check if a custom activity can be started
2015-01-29 18:45:51 +00:00
Fyodor Kupolov
9fce918551
am bd89b7b4
: am 0d5ad3b7
: am 57641a8b
: am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started
...
* commit 'bd89b7b45ef9572c5e8523f0c8bd723958847df5':
Added a check if a custom activity can be started
2015-01-29 18:24:21 +00:00
Fyodor Kupolov
bd89b7b45e
am 0d5ad3b7
: am 57641a8b
: am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started
...
* commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
Added a check if a custom activity can be started
2015-01-29 18:19:06 +00:00
Fyodor Kupolov
0738bae916
am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started
...
automerge: 57641a8
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
Added a check if a custom activity can be started
2015-01-29 18:12:42 +00:00
Fyodor Kupolov
2f3bc3cb3f
am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
Added a check if a custom activity can be started
2015-01-29 18:12:04 +00:00
Fyodor Kupolov
0d5ad3b73e
am 57641a8b
: am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started
...
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
Added a check if a custom activity can be started
2015-01-29 18:09:29 +00:00
Fyodor Kupolov
57641a8b50
am d7e93570
: am f11f9f47
: Added a check if a custom activity can be started
...
* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
Added a check if a custom activity can be started
2015-01-29 18:02:40 +00:00
Fyodor Kupolov
e3904c4f09
am e8e7b9b3
: Added a check if a custom activity can be started
...
* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
Added a check if a custom activity can be started
2015-01-29 18:01:00 +00:00
Fyodor Kupolov
d7e93570d3
am f11f9f47
: Added a check if a custom activity can be started
...
* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
Added a check if a custom activity can be started
2015-01-29 17:55:47 +00:00
Pavel Zhamaitsiak
882000f39b
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
2015-01-28 18:59:18 +00:00
Geoff Mendal
b5ad15ae24
Import translations. DO NOT MERGE
...
Change-Id: I5d5971528e80df5a3582a364a0153338c63701d8
Auto-generated-cl: translation import
2015-01-28 06:47:47 -08:00
Fyodor Kupolov
f11f9f47d3
Added a check if a custom activity can be started
...
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.
Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e
)
2015-01-28 10:31:36 +00:00
Fyodor Kupolov
e8e7b9b381
Added a check if a custom activity can be started
...
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.
Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
2015-01-28 05:23:07 -05:00
Mick Lin
09c9e5eb5d
[DS] Correct the access method for telephony system property
...
Bug: 18675498
Review: https://partner-android-review.git.corp.google.com/#/c/198822
Change-Id: I7d6eab7d8f513de20bd8995b999a124097f725e7
2015-01-27 05:30:47 +00:00
Jeff Sharkey
9c167e92df
Fix secondary data usage color regression.
...
Show overall usage with a 50% transparency when looking at a
specific app details page. (Otherwise you can't tell them apart.)
Bug: 18927935
Change-Id: I0cad1ba0451a9dab3ed90fa5aa53c115dbe3e1d3
2015-01-26 14:18:19 -08:00
Geoff Mendal
26a3e949c5
Import translations. DO NOT MERGE
...
Change-Id: Iec41803b44675805c7c1df742682b986fb1015f0
Auto-generated-cl: translation import
2015-01-26 06:43:26 -08:00
Sanket Padawe
a8b78f96ae
Merge "Hide APNs with type="ia" and apn=""" into lmp-mr1-dev
2015-01-23 23:55:13 +00:00