196438 Commits

Author SHA1 Message Date
David Friedman
4fd1a573eb Docs: Localized M-Preview pages
Bug: 21789313

Change-Id: Ifb4a45a65acd7b786e05bdf7b7dd86698093fbdf
2015-06-29 16:03:08 -07:00
Shriram Ganesh
ef0cde848b IMS: Map pay phone and unknown presentation with OIR.
Current code does not map pay phone and unknown
presentation with OIR.
Add code to map pay phone and unknown presentation
with OIR correctly.

Bug: 22123243
Change-Id: I7610db8547a0f0f5529c2627879047dd9a45cf9f
2015-06-29 15:54:54 -07:00
Jean-Michel Trivi
3a0d77f42a Merge "Volume change intent carries stream alias" into mnc-dev 2015-06-29 22:11:35 +00:00
Andrew Solovay
4653cdecab am 350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '350286e613cdde99f347bd115c406e790a242f87':
  docs: Clarified when you can put the fragments in the root view.
2015-06-29 21:55:09 +00:00
Makoto Onuki
a26a019c6c Allow default SMS app to get self phone number
Apps with WRITE_SMS app op can now call TelephonyManager.getLine1Number().
(Note we no longer have the WRITE_SMS permission.)

Bug 22031904

Change-Id: Ic843b6d7674879951a64e3b3a92bca09c3b5c65b
2015-06-29 14:51:09 -07:00
Andrew Solovay
350286e613 Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs 2015-06-29 21:42:48 +00:00
Alex Klyubin
fdbc02a433 Enforce IND-CPA requirement when generating asymmetric keys.
This enforces the randomized encryption requirement (IND-CPA), if
requested, when generating asymmetric key pairs. Whether randomized
encryption is used depends on the encryption padding modes authorized
for the key pair. Thus, if randomized encryption is required, the
KeyPairGenerator must reject attempts to generate keys authorized for
encryption using non-compliant padding schemes.

This is similar to the existing check in AndroidKeyStoreImpl during
asymmetric key import.

Bug: 22179911
Change-Id: I3d85367259c17bd44198a736ace853d0d3567d5e
2015-06-29 14:39:29 -07:00
Filip Gruszczynski
e89d821e33 am b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-dev
* commit 'b6c158f9d863768d5d8315f2a4a4bb87c4db2fea':
  Dump of previous vibrations.
2015-06-29 20:59:50 +00:00
Filip Gruszczynski
b6c158f9d8 Merge "Dump of previous vibrations." into cw-d-mr1-dev 2015-06-29 20:47:10 +00:00
Yohei Yukawa
4daf600ee0 Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 2015-06-29 20:42:54 +00:00
Yang Ni
fd5ec27bf9 Merge "Add Java doc comments on script group name reuse" into mnc-dev 2015-06-29 20:38:16 +00:00
Eddie Ringle
22369d519d Fix FragmentTransaction replace() behavior
Bug 22174959

According to FragmentTransaction's reference, replace()
should be equivalent to remove()'ing every fragment in
a given container and then adding the specified fragment
to replace those that were removed.

Commit ee76efb74b5886f98cdfebfbefe9b69224e016fb broke
this intended behavior in the framework.

This patch makes it so that the removal loop doesn't
end prematurely. It also fixes an issue where the
replace operation would remove fragments regardless
of their container after encountering the first fragment
with a matching container ID.

Relevant issues:
http://b.android.com/43265
http://b.android.com/52112
http://b.android.com/53393
http://b.android.com/68856
http://b.android.com/70803

Change-Id: Ica4691746ab8979ed974a998e85324e4feacc5e3
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
2015-06-29 13:13:01 -07:00
John Spurlock
c3409dd253 Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev 2015-06-29 20:08:44 +00:00
Aravind Akella
d123b51f8b Changes to Data Injection mode APIs
Change-Id: Id55eaf03656d2d55df7f38d4cac643d97354fe9b
2015-06-29 13:04:09 -07:00
Alan Viverette
a1b647c883 Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 2015-06-29 19:39:29 +00:00
John Spurlock
bc7233a8a3 Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
Use ACTION_CLOSE_SYSTEM_DIALOGS as an additional signal to immediately
dismiss the volume dialog, if showing.  Otherwise nav bar navigation
will not immediately dismiss the dialog.

Bug: 22173890
Change-Id: I3eee85a4579b4673b19402cf0f4048068009be35
2015-06-29 15:34:18 -04:00
Christopher Tate
795d95ecd7 Merge "Throw DeadObjectException on failed transaction, not RuntimeException" into mnc-dev 2015-06-29 18:54:58 +00:00
Christopher Tate
ffd5864202 Throw DeadObjectException on failed transaction, not RuntimeException
In practice we only see failed transactions with small payloads when
the remote dies while the binder operation is in flight.  Throw the
applicable exception type rather than the generic "oops binder went
haywire" one.

Bug 22104446

Change-Id: I785c15617db7a1f4d505aa11f16e61551c8357ba
2015-06-29 11:52:23 -07:00
Wale Ogunwale
810d5ed23b Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev 2015-06-29 18:13:06 +00:00
Jean-Michel Trivi
560877d498 Volume change intent carries stream alias
Define a new extra, AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, to be
  sent along with the volume change intent, VOLUME_CHANGED_ACTION.
When sending VOLUME_CHANGED_ACTION, attach the stream type alias.

Bug 17955277

Change-Id: I04fd279e223504e3ee1581086d7e9205344a6808
2015-06-29 10:44:16 -07:00
Svet Ganov
ca2c590ba3 Remove the empty accounts group and not needed storage resources.
bug:22044480

Change-Id: I76297f5540614301893871b3b41219002076b920
2015-06-29 10:19:07 -07:00
Jae Seo
82b3f67711 Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 2015-06-29 17:14:43 +00:00
Nicolas Prevot
6fd49936ae Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 2015-06-29 17:08:34 +00:00
Makoto Onuki
cadf3969c3 Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-dev 2015-06-29 16:56:09 +00:00
Geoff Mendal
b05e2286a9 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-29 16:50:57 +00:00
Geoff Mendal
cda214a1c3 Import translations. DO NOT MERGE
Change-Id: Ia7c3e19454b5350971e62e79804cc45512436b98
Auto-generated-cl: translation import
2015-06-29 09:45:56 -07:00
Esteban Talavera
656fa7f5d1 Marking some globals from setGlobalSetting as not supported
Those globals don't have the intended behaviour any more.

Bug: 19967818
Change-Id: I8c7891e59280f9deb88b1f0ffead3de07f4eca56
2015-06-29 17:41:39 +01:00
Filip Gruszczynski
3a8eb0f670 Dump of previous vibrations.
It's hard to find previous vibrations when you chase excessive use that
impacts the battery. A dump of previous vibrations allows us to
investigate where the vibrations come from.

Bug: 21933068
Change-Id: I14944732927c73401e5adc7345ea9823092b1883
2015-06-29 09:28:32 -07:00
Jason Monk
435a1dfbd6 Merge "Fix weird case of multi cell icons" into mnc-dev 2015-06-29 16:19:48 +00:00
Andres Morales
59ef126f07 [LockSettings] adjust legacy patterns to base 0 for unlocking keystore
Otherwise, L keys will be lost as they're encrypted with the base 0
pattern. Keystore password is then re-enrolled with the base '1'
pattern.

Bug: 22118231
Change-Id: I37aea2afc3069f1ba48cb073268f1d66978b723e
2015-06-29 09:02:31 -07:00
John Spurlock
f21f1a9158 Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev 2015-06-29 15:50:51 +00:00
John Spurlock
dc005a8965 Volume Dialog: Fix NPE found in monkey testing.
Bug: 22116033
Change-Id: I34c586ec77bd0d2baae4e84c07afc781cda09ec3
2015-06-29 11:42:28 -04:00
tiger_huang
cc6366dde1 Use the correct lock to protect members in PolicyControl
Members in PolicyControl can be accessed by multiple threads via the
public functions called by PhoneWindowManager. Most of the functions
are called with the window-manager-lock held, but reloadFromSetting()
is an exception.

In this patch, we acquire the window-manager-lock before calling
reloadFromSetting() to ensure accessing the members with the same
lock held.

Change-Id: I54ac5cab2a2d74c568fa96145f7a6741c6d99e36
2015-06-29 08:18:36 -07:00
Benjamin Franz
adea1918be Make ContentObservers work across profiles
Currently registering for changes to a cross-user Uri does not work, as
the calling user id is used to identify the Uri. Change this to use the
userId the Uri is associated with. In order to protect Uris across
users, we only allow registration for a Uri when the caller has read
permission. We also only allow notify calls from across users when the
caller has write permission to the Uri.

Bug: 19312280
Change-Id: Ide216b09980ed5ebefe9b37c946dd8160167809f
2015-06-29 16:17:55 +01:00
Kenny Guy
14f48e5a93 Deprecate APIs for admin to create users.
Bug: 21921868
Change-Id: I0a59c85f6a87928de3df72278d4b65355ff7270f
2015-06-29 15:11:25 +00:00
Jason Monk
8fcab35828 Fix weird case of multi cell icons
- Don't auto-inflate cell icons
 - Move callback to better time (shouldn't get callbacks before
   setSubs)
 - Fix accidental callback in MobileSignalController constructor
 - Fix subscription listener to run on the right thread to avoid
   the thread issue allowing this bug

Bug: 21504138
Change-Id: Ie1adf8eb05e1042245eead5354b29b314a2e0aae
2015-06-29 11:00:24 -04:00
Geoff Mendal
e3fc5415ed Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-29 13:59:39 +00:00
Geoff Mendal
3945defe60 Import translations. DO NOT MERGE
Change-Id: I0a27f1d72cdcad094a9651c223f14e3a928ea2c3
Auto-generated-cl: translation import
2015-06-29 08:52:39 -05:00
Geoff Mendal
208daa1d76 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-29 13:41:41 +00:00
Geoff Mendal
d38d3e2b1f Import translations. DO NOT MERGE
Change-Id: Ia1829162e64c53a9c9df9211f41bf29d4e67fd20
Auto-generated-cl: translation import
2015-06-29 08:40:48 -05:00
Kenny Guy
43904fd5b7 Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11 Revert "Deprecate APIs for admin to create users."
This reverts commit ea864c4d4d7ca390d3b67868fd2a640411bff020.

Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69 Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662 Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-29 12:42:21 +00:00
Nicolas Prevot
f1fff79769 Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." into mnc-dev 2015-06-29 11:28:13 +00:00
Benjamin Franz
b6fb3fe8f4 Merge "Block assist when screenshots are disabled by policy" into mnc-dev 2015-06-29 10:29:23 +00:00
Niels Egberts
1ea7a81931 Merge "Fix crash with engines that don't override getVoices()." into mnc-dev 2015-06-29 09:34:44 +00:00
Seigo Nonaka
e96b1c6f82 Merge "Fix crash due to reverse selection." into mnc-dev 2015-06-29 03:02:45 +00:00
Yang Ni
dbb6fd58a4 Add Java doc comments on script group name reuse
b/21999787

Change-Id: Id9a7bad4ce91f3afdd82a1288cf94430f3aef9bb
2015-06-28 16:09:57 -07:00
Sanket Padawe
253cea18fe Merge "Add flag indicating device supporting EAP SIM, AKA & AKA'." into mnc-dev 2015-06-28 02:54:04 +00:00