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
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
Carlos Valdivia
db591467f6
am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '737d2d538b81ee843192d229ef558e69f2a944a9':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 17:05:31 +00:00
Carlos Valdivia
61ced6d427
am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '01137c2004a617dae870f9c07b34a29f8706b615':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:49:32 +00:00
Carlos Valdivia
01137c2004
am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
...
* commit '663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-11 16:42:54 +00:00
Carlos Valdivia
37b58a420f
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
...
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends. This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.
Bug: 17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
(cherry picked from commit f5d3e74ecc
2014-09-10 21:13:10 +00:00
Griff Hazen
bd04208989
DO NOT MERGE Fix build for notification listener internal api change
...
Bug: 15426276
Change-Id: I3861eb03796f9938f66237454aea148f5c64b370
2014-06-17 21:43:19 -07:00
Christopher Tate
442f01c601
am 95228074: am c44d7c6b: Prohibit uninstall of the default (or only) home app
...
* commit '95228074d2e01575799a526a29ec53a61c36aa23':
Prohibit uninstall of the default (or only) home app
2014-04-22 18:05:39 +00:00
Christopher Tate
c44d7c6be6
Prohibit uninstall of the default (or only) home app
...
We suppress the ability to uninstall (including uninstall of updates to
system-bundled apps) when the package in question is either the only
installed home app, or has been explicitly tagged by the user as the
"every time" home app among all those installed.
Bug 14162565
Change-Id: I582bb0d2abf0911ac68813f4c7e6fd7d17bfc2ca
2014-04-22 10:42:10 -07:00
Adrian Roos
79a1792446
am 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '0b55caf01af1efa15ff0bfbf50a1726fce788660':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:51:39 +00:00
Adrian Roos
a52a37b0fe
am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '1b0b38cfeb54638899ddab48ff9198590f951a55':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:38:30 +00:00
Adrian Roos
1b0b38cfeb
am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:35:13 +00:00
Adrian Roos
90630f6a6d
am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '09235d1065b501aa8a42e0767d72c15e7b846bae':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:23:57 +00:00
Adrian Roos
09235d1065
am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '82b3e62a4f8c8a229f700bbf122b8f8854162146':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:17:11 +00:00
Adrian Roos
c4bfea207a
am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '3f38173fadc1423d4c36b265a2ab5fdc09d88271':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:58:57 +00:00
Adrian Roos
3f38173fad
am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '3a7690b157c100f3a36b6fdc2578a12845875e06':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:55:28 +00:00
Adrian Roos
3a7690b157
am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:49:53 +00:00
Adrian Roos
8184ea5245
Add lockout after trying to enter PIN / Password too often
...
Enforce the same lockout that is already enforced when entering the pattern.
Bug: 13647935
Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
2014-04-02 16:28:10 +02:00
John Spurlock
c423138247
DO NOT MERGE Settings: Implement new required method.
...
Only required since it uses the non-public version
of the api.
Bug:13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa
2014-03-28 09:41:30 -04:00
Wei Wang
41f5437def
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
...
This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8
2014-03-19 22:37:27 -07:00
Alan Viverette
429720754d
am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
...
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
DO NOT MERGE Add preference for caption text opacity
2014-03-13 10:01:45 +00:00
Alan Viverette
c736f794ac
am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
...
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-13 10:01:42 +00:00
RoboErik
5791cecc9e
b/12068020 Update calls to InputManager. Do not merge
...
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/
This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.
Change-Id: I9072c5b5c822b73188a6c572945f87b4a7c03139
2014-03-12 12:53:46 -07:00
Alan Viverette
8840aa4c40
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
2014-03-11 02:11:52 +00:00
Alan Viverette
d43d5becb3
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
2014-03-11 02:11:41 +00:00
Alan Viverette
00f221dc9e
DO NOT MERGE Add preference for caption text opacity
...
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2014-03-07 14:06:29 -08:00
Alan Viverette
af28facb6f
DO NOT MERGE Remove extra fragment in captioning preferences
...
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2014-03-07 14:06:07 -08:00
Rob Fletcher
549a39b495
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
...
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML
Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
2014-03-06 11:51:15 -08:00
Amith Yamasani
aea431f24b
am f6971ee1: am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'f6971ee1d52a0e258fa60306b07cb8348d88baf8':
Remove unused DebugIntentSender
2014-02-05 20:43:52 +00:00
Amith Yamasani
f6971ee1d5
am 454df35e: am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '454df35ee323ec9ca21b0c1ed982eba263df70e3':
Remove unused DebugIntentSender
2014-02-05 20:40:39 +00:00
Amith Yamasani
3c4603ef1c
am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '8f9482170835059c11cffa9c554191306db49fbd':
Remove unused DebugIntentSender
2014-02-05 20:35:24 +00:00
Amith Yamasani
8f94821708
am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
2014-02-05 12:33:48 -08:00
Amith Yamasani
0ad774458a
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
2014-02-05 11:52:23 -08:00
Amith Yamasani
7c0ada6554
am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
2014-02-05 11:27:30 -08:00
Amith Yamasani
0fce6123bd
am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0
am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d
am c7843db0: Remove unused DebugIntentSender
...
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
2014-02-05 11:04:25 -08:00
Amith Yamasani
c7843db06c
Remove unused DebugIntentSender
...
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4
2014-02-04 23:48:05 +00:00
John Spurlock
af87ce0991
am 04119285: am cb8a5354: am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit '041192855ed8b025246578d80f0b372bf346a2f1':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:48:12 +00:00
John Spurlock
cb8a53541e
am 3f0f02b9: Merge "\'When to daydream\' dialog does not follow the JB dialog design guide"
...
* commit '3f0f02b94e5be6724659f860aef5e637ff61d3aa':
'When to daydream' dialog does not follow the JB dialog design guide
2014-01-28 15:40:45 +00:00
Per Allard
6251d707b1
'When to daydream' dialog does not follow the JB dialog design guide
...
The dialog is a single selection popup and according to the
dialogs design guide the popup should close when the user
has make his/her choice, but in this case it does not.
Change-Id: Iac6bc19146a88236d3253d2d846212ce09b4925b
2014-01-23 18:15:56 +09:00
Wei Wang
f4f8d9f346
BLE peripheral mode (4/4): Settings change for advertising preference.
...
Change-Id: I5721f136267fe25e55f764bb4a6c53acd45b318b
2014-01-14 18:06:42 -08:00
Jeff Sharkey
859909fee8
am b5377a71: Merge "Fix null pointer exceptions in NetworkPolicyEditor"
...
* commit 'b5377a7165a1f09c3cbd5c76f5a5745f6efc28e5':
Fix null pointer exceptions in NetworkPolicyEditor
2014-01-10 15:08:40 -08:00
Jeff Sharkey
b5377a7165
Merge "Fix null pointer exceptions in NetworkPolicyEditor"
2014-01-10 23:04:31 +00:00
Amith Yamasani
e7d8485a23
am 5be77489: Merge "Dont show "Erase SD Card" when there is none"
...
* commit '5be77489e2f1f7b5c68763cf7660e844587d5e9e':
Dont show "Erase SD Card" when there is none
2014-01-07 10:42:15 -08:00
Amith Yamasani
5be77489e2
Merge "Dont show "Erase SD Card" when there is none"
2014-01-07 18:37:54 +00:00
Elliott Hughes
97886741b9
am f85d9841: Merge "Fix elapsed time formatting."
...
* commit 'f85d9841f8e198de656973a2102d3239e628390a':
Fix elapsed time formatting.
2014-01-03 13:36:27 -08:00
Elliott Hughes
f7cb4b0dda
Fix elapsed time formatting.
...
We should extend DateUtils to provide this kind of elapsed time
formatting via icu4c, but for now let's at least fix our
arithmetic.
Bug: https://code.google.com/p/android/issues/detail?id=61479
Change-Id: I6c087dbb9fdbff0a21d9243d239126fee180454c
2014-01-03 12:14:13 -08:00
Johan Redestig
5517ad92dd
Dont show "Erase SD Card" when there is none
...
On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:
Card present and mounted -> Erase enabled
Card present but unmounted -> Erase enabled
No card present -> Erase disabled
Card present and MTP attached -> Erase disabled
Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
2013-12-19 10:47:17 +01:00
Behrooz Aliabadi
524dee0fb5
Fix null pointer exceptions in NetworkPolicyEditor
...
This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.
Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
2013-12-18 09:55:45 +00:00
