Jason Monk
8bba0d5c30
am f9efe750
: am acc731ad
: am fa9d2791
: Merge "Add tap to wake setting" into mnc-dev
...
* commit 'f9efe750f4c89be270a9880a05745b24ef802a5e':
Add tap to wake setting
2015-05-12 15:09:28 +00:00
Jason Monk
f9efe750f4
am acc731ad
: am fa9d2791
: Merge "Add tap to wake setting" into mnc-dev
...
* commit 'acc731ada864917bfe4d25dff149a0cf36e1d563':
Add tap to wake setting
2015-05-12 14:57:16 +00:00
Jason Monk
acc731ada8
am fa9d2791
: Merge "Add tap to wake setting" into mnc-dev
...
* commit 'fa9d27918df47220802678055421beb9fbfdaf50':
Add tap to wake setting
2015-05-12 14:44:41 +00:00
Jason Monk
fa9d27918d
Merge "Add tap to wake setting" into mnc-dev
2015-05-12 14:35:17 +00:00
Hemanth kumar B
81c7ac5dfd
am df7a1bc2
: am f939487c
: am 370e44d7
: Avoid SElinux denial accessing SIM card lock
...
* commit 'df7a1bc26933dabe49c3e37d1a2248aaee88c073':
Avoid SElinux denial accessing SIM card lock
2015-05-11 20:47:36 +00:00
Hemanth kumar B
df7a1bc269
am f939487c
: am 370e44d7
: Avoid SElinux denial accessing SIM card lock
...
* commit 'f939487cfcce619a595eeedfcf15fade7bfc955c':
Avoid SElinux denial accessing SIM card lock
2015-05-11 20:35:53 +00:00
Jason Monk
c952e8d059
am f1799f96
: am 72683a51
: am c24d0e1f
: Merge "Update strings for ignore optimizations control" into mnc-dev
...
* commit 'f1799f96f7126cefd26b0244ade1353ac872ca67':
Update strings for ignore optimizations control
2015-05-11 20:34:43 +00:00
Hemanth kumar B
f939487cfc
am 370e44d7
: Avoid SElinux denial accessing SIM card lock
...
* commit '370e44d72d7ff6d5ed36bbfe4fd1272c74bf5f52':
Avoid SElinux denial accessing SIM card lock
2015-05-11 20:26:44 +00:00
Jason Monk
f1799f96f7
am 72683a51
: am c24d0e1f
: Merge "Update strings for ignore optimizations control" into mnc-dev
...
* commit '72683a5152a8275b67c81bd03a2c073aa6496c60':
Update strings for ignore optimizations control
2015-05-11 20:23:20 +00:00
Hemanth kumar B
370e44d72d
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.
(cherrypicked from commit bef7221a7d
)
Change-Id: I3ba30d5d5e2c5b3c379397fbb06325101acaf490
2015-05-11 13:12:26 -07:00
Jason Monk
72683a5152
am c24d0e1f
: Merge "Update strings for ignore optimizations control" into mnc-dev
...
* commit 'c24d0e1fcc6ad1b4da39c00094289e71ab9da3a3':
Update strings for ignore optimizations control
2015-05-11 20:10:55 +00:00
Nick Kralevich
01b51b768a
am bd9cfd03
: am 1cfc2fc4
: Merge "Avoid SElinux denial accessing SIM card lock"
...
* commit 'bd9cfd03cab1e87b00f8ab1c0d1d195fb3e88b43':
Avoid SElinux denial accessing SIM card lock
2015-05-11 20:04:32 +00:00
Chad Brubaker
c2f5d2716b
am dbc759f7
: am 2ed7fc80
: Merge "Track keystore password method changes"
...
* commit 'dbc759f7696618b8ead4ceb4c889e8dea94e119c':
Track keystore password method changes
2015-05-11 20:04:31 +00:00
Jason Monk
c24d0e1fcc
Merge "Update strings for ignore optimizations control" into mnc-dev
2015-05-11 20:03:46 +00:00
Jason Monk
bcb4f2c913
Update strings for ignore optimizations control
...
Bug: 19991702
Change-Id: Ie5b54fd70176cfceb8b88cf18a9974321ba84c28
2015-05-11 16:01:21 -04:00
Nick Kralevich
bd9cfd03ca
am 1cfc2fc4
: Merge "Avoid SElinux denial accessing SIM card lock"
...
* commit '1cfc2fc41d99d588a17928ba3130ee2339845360':
Avoid SElinux denial accessing SIM card lock
2015-05-11 19:59:08 +00:00
Chad Brubaker
dbc759f769
am 2ed7fc80
: Merge "Track keystore password method changes"
...
* commit '2ed7fc80ff70f18d0e050f52ae736b5f82a035a1':
Track keystore password method changes
2015-05-11 19:53:35 +00:00
Nick Kralevich
1cfc2fc41d
Merge "Avoid SElinux denial accessing SIM card lock"
2015-05-11 19:45:21 +00:00
Chad Brubaker
2ed7fc80ff
Merge "Track keystore password method changes"
2015-05-11 19:30:45 +00:00
Barnaby James
8968ba2785
am d4c613e9
: am cea2cf43
: am 9331b9fa
: Merge "Simplify Zen mode voice activity." into mnc-dev
...
* commit 'd4c613e9970b174d0295b177c23033bab413034c':
Simplify Zen mode voice activity.
2015-05-11 19:23:44 +00:00
Barnaby James
d4c613e997
am cea2cf43
: am 9331b9fa
: Merge "Simplify Zen mode voice activity." into mnc-dev
...
* commit 'cea2cf43c49d858366c872b5e0696368fec2e9fd':
Simplify Zen mode voice activity.
2015-05-11 18:41:50 +00:00
Barnaby James
cea2cf43c4
am 9331b9fa
: Merge "Simplify Zen mode voice activity." into mnc-dev
...
* commit '9331b9fa0d416b80423b1200a80349be77463c65':
Simplify Zen mode voice activity.
2015-05-11 18:26:36 +00:00
Chad Brubaker
6c3b678ca2
Track keystore password method changes
...
(cherry-picked from commit 7236f2abba
)
Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
2015-05-11 11:21:55 -07:00
Barnaby James
9331b9fa0d
Merge "Simplify Zen mode voice activity." into mnc-dev
2015-05-11 18:15:03 +00:00
Geoff Mendal
20f8d71cc0
am 1e14cff9
: (-s ours) am 671371e5
: (-s ours) am bff0f290
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '1e14cff96a363d7c36c606a0bb498cb5195093fd':
Import translations. DO NOT MERGE
2015-05-11 16:38:33 +00:00
Geoff Mendal
1e14cff96a
am 671371e5
: (-s ours) am bff0f290
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '671371e5b4e5ceadbca289bc260be31c67529957':
Import translations. DO NOT MERGE
2015-05-11 16:28:33 +00:00
Barnaby James
0474b723e1
Simplify Zen mode voice activity.
...
Zen mode voice activity now only sets the notification mode to alarms mode
or off. A duration may be specified if it was in the original intent.
Change-Id: Ica472ca9c6dcbce473832f4f922baf225df4951b
Bug: 21024455
2015-05-11 09:20:54 -07:00
John Spurlock
91070afa12
am 62fe0df1
: am 88be59ea
: am b8099f54
: Settings: Migrate notification access screens to switch prefs.
...
* commit '62fe0df138b9987f827e46254aebfc4561b55a2d':
Settings: Migrate notification access screens to switch prefs.
2015-05-11 16:18:13 +00:00
Geoff Mendal
671371e5b4
am bff0f290
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'bff0f2905fd8128f49ff78bd9f15e81e97281c91':
Import translations. DO NOT MERGE
2015-05-11 16:14:58 +00:00
Geoff Mendal
bff0f2905f
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-05-11 16:10:13 +00:00
John Spurlock
62fe0df138
am 88be59ea
: am b8099f54
: Settings: Migrate notification access screens to switch prefs.
...
* commit '88be59ea389d39891ab93a6426300ecce509a971':
Settings: Migrate notification access screens to switch prefs.
2015-05-11 16:09:09 +00:00
John Spurlock
88be59ea38
am b8099f54
: Settings: Migrate notification access screens to switch prefs.
...
* commit 'b8099f542c21e3ac57d250837e60ec65653ab55c':
Settings: Migrate notification access screens to switch prefs.
2015-05-11 15:58:51 +00:00
John Spurlock
b8099f542c
Settings: Migrate notification access screens to switch prefs.
...
Bug: 20916418
Change-Id: I729bc3a6f853f15780f12e7d7c9f337447e399c4
2015-05-11 11:47:21 -04:00
Chris Wren
2e19e3b391
am 57228e26
: am cf3b4e2e
: am 46c8f759
: Merge "log more settings actions" into mnc-dev
...
* commit '57228e2639fb9c48f6763521ae358da4cf0254fc':
log more settings actions
2015-05-11 15:40:05 +00:00
Chris Wren
57228e2639
am cf3b4e2e
: am 46c8f759
: Merge "log more settings actions" into mnc-dev
...
* commit 'cf3b4e2edcafae8918392497a323f561ca94f76f':
log more settings actions
2015-05-11 15:28:04 +00:00
Chris Wren
cf3b4e2edc
am 46c8f759
: Merge "log more settings actions" into mnc-dev
...
* commit '46c8f759fdad71380504ad61a49031331ea39004':
log more settings actions
2015-05-11 15:17:15 +00:00
Chris Wren
46c8f759fd
Merge "log more settings actions" into mnc-dev
2015-05-11 15:07:18 +00:00
Geoff Mendal
98f714c719
Import translations. DO NOT MERGE
...
Change-Id: I57e694a0f716f9c8a45493cd1b4a2ad9d6d4a7ef
Auto-generated-cl: translation import
2015-05-11 07:50:14 -07:00
Geoff Mendal
9d8d5fe3e4
Import translations. DO NOT MERGE
...
Change-Id: I7777ee2e12e3d148ecc42f211cd7a388ad8509c6
Auto-generated-cl: translation import
2015-05-11 07:13:25 -07:00
Hemanth kumar B
bef7221a7d
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
2015-05-10 17:21:35 +02:00
Maurice Lam
8a52c565f8
am 1008c12b
: am 0d0d8e25
: am 69a03f75
: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
...
* commit '1008c12b365b2bfa54e896c859e8bac2fb686d23':
[LockScreenSetup] Fix "Choose Lock PIN" title
2015-05-09 00:28:00 +00:00
Maurice Lam
1008c12b36
am 0d0d8e25
: am 69a03f75
: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
...
* commit '0d0d8e25916f5765cc37c28332a8a1e341dbd518':
[LockScreenSetup] Fix "Choose Lock PIN" title
2015-05-09 00:21:31 +00:00
Maurice Lam
0d0d8e2591
am 69a03f75
: Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
...
* commit '69a03f75171c9f21ee4517f8e6d02cfa955c6a84':
[LockScreenSetup] Fix "Choose Lock PIN" title
2015-05-09 00:10:53 +00:00
Maurice Lam
69a03f7517
Merge "[LockScreenSetup] Fix "Choose Lock PIN" title" into mnc-dev
2015-05-09 00:04:32 +00:00
Sanket Padawe
4048110b74
am bb575513
: am 7e8b3541
: am d7cba372
: Merge "Fix Signal strength display issue in Settings." into mnc-dev
...
* commit 'bb5755138c7bc4acf0178e9178d0e4c7f4f906c5':
Fix Signal strength display issue in Settings.
2015-05-08 23:55:41 +00:00
Sanket Padawe
bb5755138c
am 7e8b3541
: am d7cba372
: Merge "Fix Signal strength display issue in Settings." into mnc-dev
...
* commit '7e8b35411e80fd3a77d27e43233aa03a7c0fc89c':
Fix Signal strength display issue in Settings.
2015-05-08 23:47:47 +00:00
Sanket Padawe
7e8b35411e
am d7cba372
: Merge "Fix Signal strength display issue in Settings." into mnc-dev
...
* commit 'd7cba372c6cdeeb8da74de0ae60a2b30ab5f4e25':
Fix Signal strength display issue in Settings.
2015-05-08 23:41:30 +00:00
Sanket Padawe
d7cba372c6
Merge "Fix Signal strength display issue in Settings." into mnc-dev
2015-05-08 23:32:48 +00:00
Sanket Padawe
afee3aa5ab
Fix Signal strength display issue in Settings.
...
Bug: 20821065
Change-Id: Ib98e7b80f5ee331ef0adb8df706bb697f9fff008
2015-05-08 16:31:35 -07:00
John Spurlock
fa222c5289
am 2d532ec3
: am ec811217
: am 3c4bf826
: Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev
...
* commit '2d532ec36fa10752e5dda766543865ff537e1351':
Settings: Use new EventInfo.ANY_CALENDAR constant.
2015-05-08 22:48:38 +00:00