OSDN Git Service
Robert Greenwalt [Wed, 13 May 2015 21:20:50 +0000 (21:20 +0000)]
Merge "Remove phone information for a secondary user"
Nick Kralevich [Mon, 11 May 2015 19:45:20 +0000 (19:45 +0000)]
Merge "Avoid SElinux denial accessing SIM card lock"
Chad Brubaker [Mon, 11 May 2015 19:30:41 +0000 (19:30 +0000)]
Merge "Track keystore password method changes"
Chad Brubaker [Thu, 7 May 2015 17:29:18 +0000 (10:29 -0700)]
Track keystore password method changes
(cherry-picked from commit
7236f2abbabefc08e68226677f51fe2117c8c0a5)
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
Hemanth kumar B [Fri, 6 Feb 2015 10:13:26 +0000 (11:13 +0100)]
Avoid SElinux denial accessing SIM card lock
This change avoids the following SELinux denial:
W/SharedPreferenc(28238): type=1400 audit(0.0:8): avc: denied\
{ search } for name="com.android.settings" dev="mmcblk0p25"\
ino=8209 scontext=u:r:radio:s0 tcontext=u:object_r:system_app\
_data_file:s0 tclass=dir op_res=-13 ppid=318 pcomm="main"\
tgid=1850 tgcomm="m.android.phone"
When accessing Settings->Security->Set up SIM card lock.
There is really no need to store this information in
SharedPreferences anyway.
Change-Id: I3ba30d5d5e2c5b3c379397fbb06325101acaf490
Raju Yadav [Wed, 29 Apr 2015 09:04:49 +0000 (11:04 +0200)]
Remove phone information for a secondary user
Default phone information is not available for a secondary
user and when accessed using service command *#*#INFO#*#*,
it causes crash in Settings. Removed the preference for a
secondary user.
To verify:
1. Add user(slide down status bar>user icon>Add user>
OK>finish the setup guide).
2. As new user launch Phone app>input “*#*#4636#*#*”>
tap Phone information>check
Causes Settings to crash with:
Caused by: java.lang.IllegalStateException: Default phones haven't been made yet!
at com.android.internal.telephony.PhoneFactory.getDefaultPhone(PhoneFactory.java:214)
at com.android.settings.RadioInfo.onCreate(RadioInfo.java:263)
at android.app.Activity.performCreate(Activity.java:5990)
at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1106)
at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2278)
Change-Id: Ie23107c5eead04183cfd8b5460a9a7a3426a99b8
Nick Kralevich [Thu, 7 May 2015 18:21:18 +0000 (18:21 +0000)]
Merge "Avoid SElinux denial accessing IMEI information"
Raju Yadav [Tue, 5 May 2015 07:01:39 +0000 (09:01 +0200)]
Avoid SElinux denial accessing IMEI information
Set persistent attribute to false so preferences are not
stored in shared preferences, this avoids the SElinux
denial:
W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \
denied { search } for name="com.android.settings" \
dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \
tcontext=u:object_r:system_app_data_file:s0 tclass=dir\
op_res=-13 ppid=319 pcomm="main" tgid=1589\
tgcomm="m.android.phone"
Observed when entering IMEI information in:
Settings > About Phone > Status > IMEI information.
It makes no sense to store this information in shared
preferences anyway so no functinoality is lost with this
change.
Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c
Elliott Hughes [Tue, 28 Apr 2015 20:41:53 +0000 (20:41 +0000)]
Merge "Add Pacific/Noumea."
Elliott Hughes [Tue, 28 Apr 2015 20:35:25 +0000 (13:35 -0700)]
Add Pacific/Noumea.
Also move Majuro to the right place in the list. It's +11, not -11.
Bug: http://b/
20417019
Change-Id: I0148a33bf542e9fb5bec77f81216a82180053c3d
Alan Viverette [Fri, 24 Apr 2015 18:05:09 +0000 (18:05 +0000)]
Merge "Settings: Fix wifi developer options summaries"
Elliott Hughes [Thu, 16 Apr 2015 15:03:03 +0000 (15:03 +0000)]
Merge "Add Europe/Madrid."
Elliott Hughes [Thu, 16 Apr 2015 00:37:16 +0000 (17:37 -0700)]
Add Europe/Madrid.
50 million Spaniards can't be wrong.
Bug:
19519953
Change-Id: I10712165d32d90977453e7053057e6260c005f84
Elliott Hughes [Thu, 2 Apr 2015 17:19:27 +0000 (17:19 +0000)]
Merge "Add Europe/Istanbul timezone"
Samuel Asteberg [Mon, 22 Sep 2014 10:24:40 +0000 (12:24 +0200)]
Add Europe/Istanbul timezone
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
Elliott Hughes [Wed, 1 Apr 2015 23:55:55 +0000 (23:55 +0000)]
Merge "add Recife timezone"
Michael Bestas [Sun, 23 Nov 2014 23:52:38 +0000 (01:52 +0200)]
Settings: Fix wifi developer options summaries
Change-Id: I85688d59685d3a0b0a48e51581eee77ebc7cd2fa
Geoff Mendal [Thu, 26 Feb 2015 21:08:22 +0000 (13:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
Sanket Padawe [Fri, 13 Feb 2015 00:01:08 +0000 (00:01 +0000)]
am
bdfdf07c: am
0362e870: am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
bdfdf07ce3b788d2962f75027f6be615c9784e10':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 23:55:01 +0000 (23:55 +0000)]
am
0362e870: am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
0362e870b258b03ec06110d032b521cac3d37bf2':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 23:47:52 +0000 (23:47 +0000)]
am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
7e21fa5ab4f867263088a38ed279d889b902a05b':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 20:39:34 +0000 (12:39 -0800)]
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug:
19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
Geoff Mendal [Thu, 12 Feb 2015 19:20:43 +0000 (19:20 +0000)]
am
31010cc1: (-s ours) Import translations. DO NOT MERGE
* commit '
31010cc15530338fdcf4e1a66a47d29c6851cbc6':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 19:05:53 +0000 (11:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
Alex Klyubin [Wed, 11 Feb 2015 19:47:09 +0000 (19:47 +0000)]
am
1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '
1d33bca0e496f980ec1a364f58cccd457d40954a':
Hidden ApplicationInfo flags are now in privateFlags.
Alex Klyubin [Wed, 11 Feb 2015 19:27:24 +0000 (19:27 +0000)]
Merge "Hidden ApplicationInfo flags are now in privateFlags."
Geoff Mendal [Wed, 11 Feb 2015 19:20:15 +0000 (19:20 +0000)]
am
d232a3fa: (-s ours) am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
d232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
Alex Klyubin [Wed, 4 Feb 2015 16:47:12 +0000 (08:47 -0800)]
Hidden ApplicationInfo flags are now in privateFlags.
See
b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
Geoff Mendal [Wed, 11 Feb 2015 15:03:56 +0000 (15:03 +0000)]
am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 15:00:50 +0000 (15:00 +0000)]
Import translations. DO NOT MERGE
automerge:
60d2ee8 -s ours
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 14:50:09 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Feb 2015 16:31:32 +0000 (16:31 +0000)]
am
37dfabff: (-s ours) am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
37dfabff82bd78d0956f41868579bdf5eb885078':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:07:10 +0000 (16:07 +0000)]
am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
713e794dac88e4e977faa95da88163db6a568e15':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 14:31:43 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Feb 2015 15:04:49 +0000 (15:04 +0000)]
Import translations. DO NOT MERGE
automerge:
40e66bc -s ours
* commit '
40e66bce6ceea1b2b9d49a26564665222eb32745':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Feb 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
Amith Yamasani [Tue, 3 Feb 2015 21:29:19 +0000 (21:29 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
automerge:
6317e06
* commit '
6317e06635ed52a9d1c1aeb0439017418f57ad0f':
set tapjacking protection for deviceadmin permission dialog
Amith Yamasani [Tue, 3 Feb 2015 21:24:51 +0000 (21:24 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
Sanket Padawe [Tue, 3 Feb 2015 18:19:05 +0000 (18:19 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge:
4decadb
automerge:
c1af278
* commit '
c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:14:03 +0000 (18:14 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge:
4decadb
* commit '
4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:10:47 +0000 (18:10 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
Andres Morales [Tue, 3 Feb 2015 16:01:45 +0000 (16:01 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
automerge:
98d8a49
* commit '
98d8a490d5930c9f6179c8aefe792012c542ddbb':
Use getDefaultAdapter instead of getNfcAdapter
Andres Morales [Tue, 3 Feb 2015 15:53:17 +0000 (15:53 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
* commit '
2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
Sanket Padawe [Tue, 3 Feb 2015 00:46:55 +0000 (16:46 -0800)]
Remove SimDialogActivity from recents app list.
Bug:
19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
Andres Morales [Mon, 2 Feb 2015 17:35:14 +0000 (09:35 -0800)]
Use getDefaultAdapter instead of getNfcAdapter
getNfcAdapter can throw an exception if NFC is not
available
Bug:
19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
Geoff Mendal [Mon, 2 Feb 2015 15:30:26 +0000 (15:30 +0000)]
am
0bb8ba32: (-s ours) Import translations. DO NOT MERGE
* commit '
0bb8ba322e0bed9d988e14888079c5d6283cfacc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Feb 2015 14:52:47 +0000 (06:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
Robin Lee [Mon, 2 Feb 2015 11:45:57 +0000 (11:45 +0000)]
am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
automerge:
d16231d
* commit '
d16231de248aeb5aeccb8f4aa226a2f1b34cc082':
Repair broken keychain wifi_uid logic
Robin Lee [Mon, 2 Feb 2015 11:28:42 +0000 (11:28 +0000)]
am
528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
* commit '
528c64e205bf1d8f8237fb4e582d152958345b92':
Repair broken keychain wifi_uid logic
Robin Lee [Mon, 2 Feb 2015 11:22:01 +0000 (11:22 +0000)]
Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
Sanket Padawe [Fri, 30 Jan 2015 19:58:41 +0000 (19:58 +0000)]
Change to fit color name text on color selection spinner in settings. automerge:
a46c723
automerge:
f99df05
* commit '
f99df057acb077e7601ec11d27be1bca0265247b':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:50:33 +0000 (19:50 +0000)]
Change to fit color name text on color selection spinner in settings.
automerge:
a46c723
* commit '
a46c7236b6d71c861b49d20dd7515a9031764909':
Change to fit color name text on color selection spinner in settings.
Sanket Padawe [Fri, 30 Jan 2015 19:23:22 +0000 (11:23 -0800)]
Change to fit color name text on color selection spinner in settings.
Bug:
19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
Robin Lee [Fri, 30 Jan 2015 14:57:25 +0000 (14:57 +0000)]
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
Stephan Huber [Fri, 23 Jan 2015 08:49:57 +0000 (09:49 +0100)]
set tapjacking protection for deviceadmin permission dialog
Second try to commit tapjacking protection for device administrator permission dialog.
Remplaced tap by spaces
Signed-off-by: Stephan Huber <huber.stephan.sit@gmail.com>
Change-Id: I8e14e713d1f039ca79f5006cdeb12b65652884fb
Sanket Padawe [Fri, 30 Jan 2015 02:52:06 +0000 (02:52 +0000)]
am
ef72625b: am
ab845180: Remove sim status and imei for secondary user.
* commit '
ef72625b5243f2afc6b63553ce57f439801d6977':
Remove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 02:41:47 +0000 (02:41 +0000)]
am
ab845180: Remove sim status and imei for secondary user.
* commit '
ab84518009c53e28e021f27696cd4e51360fccbc':
Remove sim status and imei for secondary user.
Sanket Padawe [Fri, 30 Jan 2015 01:19:26 +0000 (17:19 -0800)]
Remove sim status and imei for secondary user.
Bug:
19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
Fyodor Kupolov [Thu, 29 Jan 2015 20:56:45 +0000 (20:56 +0000)]
am
b749c336: am
c4dba451: 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 '
b749c3368c0bd40a84026b44189e9119a0a27d15':
Fyodor Kupolov [Thu, 29 Jan 2015 20:51:32 +0000 (20:51 +0000)]
am
c4dba451: 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 '
c4dba4513b22a59911bfee358c6537f53bbb89a7':
Fyodor Kupolov [Thu, 29 Jan 2015 20:46:13 +0000 (20:46 +0000)]
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':
Fyodor Kupolov [Thu, 29 Jan 2015 20:39:11 +0000 (20:39 +0000)]
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':
Fyodor Kupolov [Thu, 29 Jan 2015 20:34:29 +0000 (20:34 +0000)]
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':
Fyodor Kupolov [Thu, 29 Jan 2015 19:56:48 +0000 (19:56 +0000)]
am
32f0525c: am
ac840cd9: am
f400051c: am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
32f0525c78a0777f4811d564b8990214fb157c0c':
Fyodor Kupolov [Thu, 29 Jan 2015 19:51:01 +0000 (19:51 +0000)]
am
ac840cd9: am
f400051c: am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
ac840cd91b77c0a37723723a9d6101beec53bcd1':
Fyodor Kupolov [Thu, 29 Jan 2015 19:42:06 +0000 (19:42 +0000)]
am
f400051c: am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
f400051c3a6476154adf185399cb2ad8b2b16657':
Fyodor Kupolov [Thu, 29 Jan 2015 19:39:59 +0000 (19:39 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 19:35:11 +0000 (19:35 +0000)]
am
9e432a69: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8 automerge:
0738bae
* commit '
9e432a698b6422118c2cc0d0a6c12194c9d1fc32':
Fyodor Kupolov [Thu, 29 Jan 2015 19:29:20 +0000 (19:29 +0000)]
am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started automerge:
57641a8
automerge:
0738bae
* commit '
0738bae9164b150ce81b8cba57be9105a0308115':
Fyodor Kupolov [Thu, 29 Jan 2015 19:28:07 +0000 (19:28 +0000)]
am
c7e94b04: am
037c8118: 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 '
c7e94b04360a130153fbe4212399b7a31858d316':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:22:33 +0000 (19:22 +0000)]
am
037c8118: 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 '
037c811844cb29a16e940e6fbeae721c12715684':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 19:16:10 +0000 (19:16 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 19:09:23 +0000 (19:09 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 19:03:01 +0000 (19:03 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:57:22 +0000 (18:57 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:50:43 +0000 (18:50 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:45:51 +0000 (18:45 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:44:50 +0000 (18:44 +0000)]
am
d5fcd896: am
9fce9185: am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
d5fcd8965f894196578fae18613b3ab0f55c45bf':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:31:45 +0000 (18:31 +0000)]
am
9fce9185: am
bd89b7b4: am
0d5ad3b7: am
57641a8b: am
d7e93570: am
f11f9f47: Added a check if a custom activity can be started
* commit '
9fce9185513ebaf551ded3937c2767f9ed7bea0f':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:24:21 +0000 (18:24 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:19:06 +0000 (18:19 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:12:42 +0000 (18:12 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:12:04 +0000 (18:12 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:09:29 +0000 (18:09 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:02:40 +0000 (18:02 +0000)]
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
Fyodor Kupolov [Thu, 29 Jan 2015 18:01:00 +0000 (18:01 +0000)]
am
e8e7b9b3: Added a check if a custom activity can be started
* commit '
e8e7b9b3811b3295454298b02f136adf0527d1da':
Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 17:55:47 +0000 (17:55 +0000)]
am
f11f9f47: Added a check if a custom activity can be started
* commit '
f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
Added a check if a custom activity can be started
Pavel Zhamaitsiak [Wed, 28 Jan 2015 21:07:57 +0000 (13:07 -0800)]
resolved conflicts for merge of
23682809 to lmp-mr1-dev-plus-aosp
Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
Pavel Zhamaitsiak [Wed, 28 Jan 2015 19:04:58 +0000 (19:04 +0000)]
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
automerge:
882000f
* commit '
882000f39b91d908cc5e83cec47e7ce630d68e1a':
Add button in "hidden" settings to flip "VoLTE Provisioned" flag
Pavel Zhamaitsiak [Wed, 28 Jan 2015 18:59:18 +0000 (18:59 +0000)]
Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
Geoff Mendal [Wed, 28 Jan 2015 15:41:01 +0000 (15:41 +0000)]
am
41d5cb0c: (-s ours) am
b5ad15ae: (-s ours) Import translations. DO NOT MERGE
* commit '
41d5cb0cb32198dabd3a381074a68bcd0bb089a8':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 15:33:32 +0000 (15:33 +0000)]
am
b5ad15ae: (-s ours) Import translations. DO NOT MERGE
* commit '
b5ad15ae2476eaf53694c3c87df45df7f7773198':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 15:32:39 +0000 (15:32 +0000)]
am
fcfec915: (-s ours) Import translations. DO NOT MERGE
* commit '
fcfec9157119b28aa3daa8a9e2ce4476f18b4646':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Jan 2015 14:59:36 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec49e91adb1c662c0c59081415a2bd563b2e1d96
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Jan 2015 14:47:47 +0000 (06:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d5971528e80df5a3582a364a0153338c63701d8
Auto-generated-cl: translation import
Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]
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
07ab95c43e49facb0fc4dd11d68645b4fe8d4c88)
Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]
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
Mick Lin [Tue, 27 Jan 2015 17:22:33 +0000 (17:22 +0000)]
am
271aa608: am
09c9e5eb: [DS] Correct the access method for telephony system property
* commit '
271aa6081c16fe27d4d96f91c9530c7ec7f8b052':
[DS] Correct the access method for telephony system property
Mick Lin [Tue, 27 Jan 2015 17:17:18 +0000 (17:17 +0000)]
am
09c9e5eb: [DS] Correct the access method for telephony system property
* commit '
09c9e5eb5d8d223b3b3faa29ce8b03f8873d0553':
[DS] Correct the access method for telephony system property
Mick Lin [Thu, 22 Jan 2015 09:28:43 +0000 (17:28 +0800)]
[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