Anders Kristensen
83ee4429f1
am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."
...
* commit '7bce23f733cfaa1028e553852ff7762d7b32a893':
Remove duplicate call disconnect codes.
2014-03-28 17:40:52 +00:00
Paul Lawrence
945490c12e
Don't double prompt on booting encrypted device
...
vold will store password securely until KeyGuard requests it
and hands it on to KeyStore.
This is a revision of
https://googleplex-android-review.git.corp.google.com/#/c/418123/
which was reverted. It had two bugs in LockSettingsService.checkVoldPassword.
1) We were not checking password for null, which caused an exception
2) checkPattern/checkPassword return true if there is no saved pattern or password.
This leads to situations where we get true returned even when the password
doesn't match. Call the correct one based on what is there, not what vold
thinks ought to be there.
Bug: 12990752
Change-Id: I05315753387b1e508de5aa79b5a68ad7315791d4
2014-03-28 10:35:44 -07:00
Robin Lee
0756e4e42e
Merge "Fix privilege escalation for preferred activities"
2014-03-28 17:35:35 +00:00
Zhijun He
ecc5c8a4a8
Merge "Camera2: Fix availableTestPatternModes type"
2014-03-28 17:33:08 +00:00
Anders Kristensen
7bce23f733
am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."
...
* commit 'aee03bb1a1077427c918ad9fea5fdd1ab204f60e':
Remove duplicate call disconnect codes.
2014-03-28 17:31:33 +00:00
Anders Kristensen
aee03bb1a1
am 49c06150: Merge "Remove duplicate call disconnect codes."
...
* commit '49c061501dbcff0dd6f6621afa76136d0857622a':
Remove duplicate call disconnect codes.
2014-03-28 17:27:18 +00:00
Anders Kristensen
49c061501d
Merge "Remove duplicate call disconnect codes."
2014-03-28 17:19:57 +00:00
ztenghui
1c97a5266a
Merge "Add RevealAnimator"
2014-03-28 17:19:07 +00:00
Zhijun He
a486624a6d
Camera2: Fix availableTestPatternModes type
...
Also fixed the typo in android.control.mode related
with scene mode.
Change-Id: I5e311bac4694e1ccfc8d3210fbf8b40e1b31ecef
2014-03-28 10:09:09 -07:00
Robert Craig
172d38bcda
Change when the SELinux relabel of /data/data occurs.
...
Perform the relabel of the /data/data/<pkg> directories
when the app is being scanned by the PMS. The impetus
for this change was that the data directories of forward
locked apps were receiving the wrong label during an
OTA. Because the PMS doesn't actually scan forward locked
apps til later in the boot process, the prior restorecon
call was actually applying the default label of
system_data_file for all such apps. By performing a
restorecon on each individual app as they are entered into
the PMS we can handle them correctly. This mechanism also
allows us to pass down the seinfo tag as part of the
restorecon call which drops our need to rely on the contents
of packages.list.
Change-Id: Ie440cba2c96f0907458086348197e1506d31c1b6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-28 12:24:29 -04:00
Robin Lee
5c921daa72
Fix privilege escalation for preferred activities
...
Passing in the name of an actual admin should be enough to pass the
security check as it was. This is now fixed as the caller is not
given the opportunity to spoof its own name any more.
Change-Id: Id8be4ca4c8bf3751a1ee8125cf119fa100c81d22
2014-03-28 15:09:49 +00:00
John Spurlock
5579ec33eb
DO NOT MERGE Enhance the NotificationListenerService api.
...
Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void
Add to StatusBarNotification:
- getKey() : String
Bug:13562828
Change-Id: I9da222cb4af22864bc0ecdecc3f121bced0723d6
2014-03-28 10:19:00 -04:00
John Spurlock
0e14f2d455
Merge "Remove obsolete MultiWaveView"
2014-03-28 13:11:09 +00:00
John Spurlock
a4294297d4
Enhance the NotificationListenerService api.
...
Add to NotificationListenerService:
- getActiveNotificationKeys() : String[]
- getActiveNotifications(String[] keys) : StatusBarNotification[]
- cancelNotifications(String[] keys) : void
- onListenerConnected(String[] keys) : void
Add to StatusBarNotification:
- getKey() : String
Bug:13562828
Change-Id: Idd9605dad8f942d68b4b32ab9625faf6c8642db9
2014-03-28 08:47:01 -04:00
Selim Cinek
ba6ae57f64
Merge "Improved expansion logic of NotificationStackScroller"
2014-03-28 12:19:01 +00:00
Selim Cinek
fab078b01f
Improved expansion logic of NotificationStackScroller
...
Expansion of a notification with a single finger is now possible
if the NotificationStackScroller has not started scrolling yet.
Change-Id: I96b622632b448915526dd08cc2e4771d404b096f
2014-03-28 12:00:55 +00:00
Wei Wang
45e1bcdac3
am 0d68a52a: am 9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev
...
* commit '0d68a52ad32bb2c07314721b19e7973df6045d34':
Add comment of using same callback for start/stop advertising.
2014-03-28 05:35:38 +00:00
Scott Main
d19320afbf
am ebfb9c72: am d27f82f9: am a3a4d466: am 83d6ae28: fix broken links
...
* commit 'ebfb9c7253140531847af4a6f1c7acd64e0a4af5':
fix broken links
2014-03-28 05:35:16 +00:00
Jeff Sharkey
0d7f7a736e
am 0a42e5fa: am 2d8f330f: am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads.
...
* commit '0a42e5fa293fd945959b26af144030571083b22f':
Enlarge space allowed for internal downloads.
2014-03-28 05:27:02 +00:00
Brian Carlstrom
da89d891f6
am 301ffc41: (-s ours) am bd877cb6: am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
...
* commit '301ffc4177ee2a556e5d22f3fcf84dadd5a59b44':
Revert "Remove doSingleCrunch call DO NOT MERGE"
2014-03-28 05:26:58 +00:00
Wei Wang
0d68a52ad3
am 9d3e0996: Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev
...
* commit '9d3e099699c3b6cd0f4bed344607d6a5acd75c1c':
Add comment of using same callback for start/stop advertising.
2014-03-28 04:07:55 +00:00
Wei Wang
9d3e099699
Merge "Add comment of using same callback for start/stop advertising." into klp-modular-dev
2014-03-28 04:04:47 +00:00
Scott Main
ebfb9c7253
am d27f82f9: am a3a4d466: am 83d6ae28: fix broken links
...
* commit 'd27f82f92af7de43dedb077f82b1024496d501b8':
fix broken links
2014-03-28 03:29:05 +00:00
Scott Main
d27f82f92a
am a3a4d466: am 83d6ae28: fix broken links
...
* commit 'a3a4d46609ebb1470d24c7d77662a8b16440765c':
fix broken links
2014-03-28 03:23:18 +00:00
Scott Main
a3a4d46609
am 83d6ae28: fix broken links
...
* commit '83d6ae2804e280bd1e0980faf4e3090d240eb5f5':
fix broken links
2014-03-28 03:15:10 +00:00
Scott Main
83d6ae2804
fix broken links
...
Change-Id: I5964804c219ef02cd5f380bf752061ff7a022d61
2014-03-27 20:07:48 -07:00
Wei Wang
f3f52b1b4c
Add comment of using same callback for start/stop advertising.
...
Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
2014-03-27 19:34:46 -07:00
Jeff Sharkey
0a42e5fa29
am 2d8f330f: am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads.
...
* commit '2d8f330fe709d405915ebb1fa2673e575e19112e':
Enlarge space allowed for internal downloads.
2014-03-28 01:56:08 +00:00
Brian Carlstrom
301ffc4177
am bd877cb6: am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
...
* commit 'bd877cb67f09277679007bc705e28ee4a2eda02f':
Revert "Remove doSingleCrunch call DO NOT MERGE"
2014-03-28 01:50:53 +00:00
Jeff Sharkey
2d8f330fe7
am a686d16d: am 0bc7cea6: Enlarge space allowed for internal downloads.
...
* commit 'a686d16d5924d2afe06586110e7dca33ecad535c':
Enlarge space allowed for internal downloads.
2014-03-28 01:49:21 +00:00
Brian Carlstrom
bd877cb67f
am 69511ada: am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
...
* commit '69511ada3cc833f341bd7df006de0f8c44848eb8':
Revert "Remove doSingleCrunch call DO NOT MERGE"
2014-03-28 01:45:14 +00:00
Jeff Sharkey
a686d16d59
am 0bc7cea6: Enlarge space allowed for internal downloads.
...
* commit '0bc7cea6aa2523f9f519f63038c541cb1b1942a8':
Enlarge space allowed for internal downloads.
2014-03-28 01:43:53 +00:00
ztenghui
4dc16b370c
Add RevealAnimator
...
Expose this as a ValueAnimator throught a new API as
View.createRevealAnimator().
Change-Id: Ia6aac452988f001023478ee1ca0f268960e23f25
2014-03-27 18:30:20 -07:00
Jeff Sharkey
0bc7cea6aa
Enlarge space allowed for internal downloads.
...
Bug: 13673309
Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d
2014-03-27 18:16:32 -07:00
Brian Carlstrom
69511ada3c
am b244097b: am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
...
* commit 'b244097b48398514c88c21506567fe400fb41f9e':
Revert "Remove doSingleCrunch call DO NOT MERGE"
2014-03-28 01:13:04 +00:00
Brian Carlstrom
b244097b48
am cc4d10d0: (-s ours) am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
...
* commit 'cc4d10d0f1f349ad13dcd67fc19718bf31932840':
Revert "Remove doSingleCrunch call DO NOT MERGE"
2014-03-28 01:08:43 +00:00
Brian Carlstrom
cc4d10d0f1
am cec0280a: am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
...
* commit 'cec0280a1d935cf31f6b2b480af0f463e2d8c91a':
Revert "Remove doSingleCrunch call DO NOT MERGE"
2014-03-28 01:01:40 +00:00
Selim Gurun
b080c3c54a
Support for new gTLDs
...
Bug: 13006774
Add support for new generic Top-Level Domains (gTLDs) from ICANN
and deprecate the public APIs that depend on them. Due to the
fast profileration of gTLDs, it has become hard to keep this API
up-to-date. Further it already fails to recognize internal domains.
We thus replace them with simple "any letter sequence" regexps.
This CL is almost same as Ib6cb5360bbb4a02b14bb34acb30d1cc8ddec771b.
The difference is that the values of the public gTLD strings are only
deprecated and not modified.
Change-Id: I37c130ace9068b80eeaec3282a77450517ed7794
2014-03-27 16:56:54 -07:00
Baligh Uddin
7d1ad86912
am e136f5e2: (-s ours) am 0b7f300a: (-s ours) am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'e136f5e26f238c6450cad467435cce2f3a75f1c3':
Import translations. DO NOT MERGE
2014-03-27 23:16:55 +00:00
Selim Cinek
49fb8aeff5
am c3db8011: am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit 'c3db8011d7f7a5bcb0a9e5ae2d20022c6e88d8f9':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:16:51 +00:00
Baligh Uddin
e136f5e26f
am 0b7f300a: (-s ours) am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '0b7f300a5545dc3576e74f4702bcc6b5497348f1':
Import translations. DO NOT MERGE
2014-03-27 23:10:35 +00:00
Selim Cinek
c3db8011d7
am 58e99f56: am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit '58e99f564d552984d5088969a2aa827812db10ac':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:10:32 +00:00
Baligh Uddin
0b7f300a55
am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '852750b321c8f23c0b776a193a65d8f78afcf22b':
Import translations. DO NOT MERGE
2014-03-27 23:05:01 +00:00
Selim Cinek
58e99f564d
am b6e077dc: am 7718fc12: Fixed crash when setting wallpaper with built in rotation
...
* commit 'b6e077dcbe1034007fd52b48951637a9be4bab74':
Fixed crash when setting wallpaper with built in rotation
2014-03-27 23:04:57 +00:00
Chris Craik
024433f896
Disable shadow overdraw avoidance in the inverse clip case
...
The caster is effectivly transparent, so skip the optimization just as
is done for alpha < 1.0
Change-Id: I3d294222adf0137e20c1fb5808313d487e92e0a8
2014-03-27 16:01:04 -07:00
Alan Viverette
7c495dcd11
Merge "Enforce restrictions on recycled TypedArrays"
2014-03-27 22:40:07 +00:00
Alan Viverette
fd274a0d4a
Enforce restrictions on recycled TypedArrays
...
No calls may be made to recycled TypedArrays, and we'll throw a
detailed exception if developers attempt to do so. Also fixes the
place where we were doin' it wrong.
BUG: 13673783
Change-Id: Ia7a382d90fce8aef7741d926028b2d01b57435ae
2014-03-27 15:39:15 -07:00
Brian Carlstrom
cec0280a1d
am bea6517d: am e0b94d1c: (-s ours) Revert "Remove doSingleCrunch call DO NOT MERGE"
...
* commit 'bea6517da91e9af08feb8c305ec9d9a4576dc6ad':
Revert "Remove doSingleCrunch call DO NOT MERGE"
2014-03-27 22:29:08 +00:00
Baligh Uddin
b5853c7453
am 7e905127: (-s ours) am de11c260: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '7e90512771943c2b87d96bba8a90e80eb26c65a7':
Import translations. DO NOT MERGE
2014-03-27 22:26:38 +00:00
Alan Viverette
433ee01236
Merge "Allow a null tint in TouchFeedbackDrawable"
2014-03-27 22:25:11 +00:00