PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,150 Commits 1 Branch 0 Tags
a351cda36ef5f3f81e6aadeea9f9dc2b36701faf
Commit Graph

20150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan Huber
dc333212bd 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
 2015-01-30 14:38:10 +01:00
Sanket Padawe
6439357c10 am b33c8ad5: am ef72625b: am ab845180: Remove sim status and imei for secondary user. 
* commit 'b33c8ad518796e7931cff157b06f791384d575d8':
  Remove sim status and imei for secondary user.
 2015-01-30 02:59:09 +00:00
Sanket Padawe
b33c8ad518 am ef72625b: am ab845180: Remove sim status and imei for secondary user. 
* commit 'ef72625b5243f2afc6b63553ce57f439801d6977':
  Remove sim status and imei for secondary user.
 2015-01-30 02:52:06 +00:00
Sanket Padawe
ef72625b52 am ab845180: Remove sim status and imei for secondary user. 
* commit 'ab84518009c53e28e021f27696cd4e51360fccbc':
  Remove sim status and imei for secondary user.
 2015-01-30 02:41:47 +00:00
Sanket Padawe
7720677ffc am ab845180: Remove sim status and imei for secondary user. 
* commit 'ab84518009c53e28e021f27696cd4e51360fccbc':
  Remove sim status and imei for secondary user.
 2015-01-30 02:39:23 +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
6a9d5502ef am 922e602b: 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 '922e602b3ab6b0ea22b0f84e29bad1b8ffbe8a02':
 2015-01-29 21:02:14 +00:00
Fyodor Kupolov
922e602b3a 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':
 2015-01-29 20:56:45 +00:00
Fyodor Kupolov
b749c3368c 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':
 2015-01-29 20:51:32 +00:00
Fyodor Kupolov
1e978b7691 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':
 2015-01-29 20:51:11 +00: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
Mike Lockwood
2b3591db4d Merge "Add MIDI to USB configuration developer setting" 2015-01-29 20:26:30 +00:00
Fyodor Kupolov
2b242223e6 am d5363a1e: 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 'd5363a1e3ca129fceed8a8b36de66611e4219819':
 2015-01-29 20:03:26 +00:00
Fyodor Kupolov
d5363a1e3c 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':
 2015-01-29 19:56:48 +00:00
Fyodor Kupolov
32f0525c78 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':
 2015-01-29 19:51:01 +00:00
Fyodor Kupolov
56bc9f3200 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':
 2015-01-29 19:51:01 +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
12e51d94bd am 3c7ccfe4: 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 '3c7ccfe42ef03e82f912d3d871893436fc9d8102':
  Added a check if a custom activity can be started
 2015-01-29 19:35:36 +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
3c7ccfe42e 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
 2015-01-29 19:28:07 +00:00
Fyodor Kupolov
c7e94b0436 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
 2015-01-29 19:22:33 +00:00
Fyodor Kupolov
159ea9fd05 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
 2015-01-29 19:22:15 +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
7c0d63c7db am 5cf685fa: 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 '5cf685fa0072a391685defa0cb1585e91b465d44':
  Added a check if a custom activity can be started
 2015-01-29 18:56: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
5cf685fa00 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
 2015-01-29 18:44:50 +00:00
Fyodor Kupolov
0897212d2d 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
 2015-01-29 18:32:55 +00:00
Fyodor Kupolov
d5fcd8965f 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
 2015-01-29 18:31:45 +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
Fyodor Kupolov
290e137456 Merge "Use primaryUserOnly attribute to disable CryptKeeper" 2015-01-28 22:52:46 +00:00
Pavel Zhamaitsiak
dd8aa9d3d2 resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp 
automerge: d67ad20

* commit 'd67ad203db73eb986f105cf65c85467ad610b221':
  Add button in "hidden" settings to flip "VoLTE Provisioned" flag
 2015-01-28 21:28:39 +00:00
Pavel Zhamaitsiak
d67ad203db resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp 
Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
 2015-01-28 13:07:57 -08:00
Pavel Zhamaitsiak
8594728f59 am 882000f3: Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev 
* commit '882000f39b91d908cc5e83cec47e7ce630d68e1a':
  Add button in "hidden" settings to flip "VoLTE Provisioned" flag
 2015-01-28 19:05:16 +00:00
Pavel Zhamaitsiak
236828098c 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
 2015-01-28 19:04:58 +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