197284 Commits

Author SHA1 Message Date
Roshan Pius
cf01fd0f12 Merge "Catch & log security exception in telephonymanager" into mnc-dev 2015-07-13 23:17:04 +00:00
Robert Schaub
7182f075fa Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs 2015-07-13 23:12:44 +00:00
Robert Schaub
3430bec7e0 Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs 2015-07-13 23:06:46 +00:00
Alex Klyubin
6f2eb6d7a6 Fix Android Keystore key factories to obey JCA contract.
Android Keystore provider's KeyFactory and SecretKeyFactory
implementations were throwing UnsupportedOperationException instead of
InvalidKeyException/InvalidKeySpecException from their
translateKey/generateKey methods.

Bug: 22459811
Change-Id: I6d5a5dc1bed724e858ad324d558b7480b9b848da
2015-07-13 15:26:17 -07:00
Amit Mahajan
53e5ba22c1 Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev 2015-07-13 22:08:38 +00:00
Felipe Leme
e28d7fc21c Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
BUG: 20447313
Change-Id: Iecbaf3ce2f0e3d82ac31a6c7bfbd8fb3037de5e4
2015-07-13 14:59:35 -07:00
John Reck
f96d9c5421 Merge "Improve resource loading by ~3x" into mnc-dev 2015-07-13 21:50:28 +00:00
John Reck
4feb326015 Improve resource loading by ~3x
Bug: 22392651

ColorStateLists were never cached because the lazy-create
of the constant state had a typo.

Resource caching in general was broken because ThemeKey did not
clone the hash code, so all keys in the cache had a hashCode
of 0 which did not match the real, uncloned ThemeKeys hash code
so the binary search in ArrayMap based off of hash code was failing.

Change-Id: I9df1628b226bfa797bed97875354c19bf64f41ad
2015-07-13 14:42:43 -07:00
Jason Monk
ab52527262 Add a dumpsys for KeyguardUpdateMonitor
Include the info used when determining carrier text display.

Bug: 22212693
Change-Id: I12f01683c259ff11c7f27eec5d03d53f0b290d0b
2015-07-13 17:05:16 -04:00
Wale Ogunwale
093d8de298 Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 2015-07-13 20:49:37 +00:00
Chris Craik
e310f83d59 Fix unsafety in SkiaShader storage, and texture unit accounting
bug:22390304

Fixes two issues:

1) The max texture unit wasn't large enough to handle the most complex
ComposeShader case (1 for draw primitive, 2 for gradient shader, 1 for
bitmap shader).

2) If a shader isn't supported by SkiaShader::store, the shader data
needs to be explicitly disabled, so we won't read uninitilized data
from it when trying to read shader information out.

Change-Id: I29ee7b7c1e07f67db88c1707bdc857daa305e713
2015-07-13 13:34:07 -07:00
Roshan Pius
7e9cb0d094 Catch & log security exception in telephonymanager
BUG: 22225068
Change-Id: I9b0053cf1041c81f409ace556b810ef79de88599
2015-07-13 13:11:09 -07:00
Vinit Deshpande
0bd08fc22a Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 2015-07-13 19:46:27 +00:00
Jim Miller
16c1764cf5 Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev 2015-07-13 18:41:31 +00:00
Aravind Akella
37511e35ae Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 2015-07-13 18:21:37 +00:00
Etan Cohen
c09544bb88 Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev 2015-07-13 18:04:43 +00:00
Amith Yamasani
1578357df7 Merge "Check user state after clearing identity." into mnc-dev 2015-07-13 18:03:20 +00:00
Chris Wren
208934ff01 Merge "fix build by restoring deleted enum" into mnc-dev 2015-07-13 17:41:49 +00:00
Julia Reynolds
fbd0a444e7 Merge "Remove personal/device group from sideloading screen." into mnc-dev 2015-07-13 17:34:20 +00:00
Chris Wren
8cba70fb05 fix build by restoring deleted enum
Bug: 21114836
Change-Id: Ied4a6e48c66f882f43343a21bce0b3ccccd81713
2015-07-13 12:59:01 -04:00
Jason Monk
28a07ff0e1 Merge "Fix demo mode issues" into mnc-dev 2015-07-13 16:22:45 +00:00
Chris Wren
4502bfb8fd Merge "add new enums to MetricsConstans" into mnc-dev 2015-07-13 16:21:24 +00:00
Jason Monk
59b1dfef62 Merge "Show volume restriction toast on all users" into mnc-dev 2015-07-13 16:21:02 +00:00
Geoff Mendal
c021aaaf6b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-13 15:37:12 +00:00
Geoff Mendal
2d81f9a2f9 Import translations. DO NOT MERGE
Change-Id: Idab7fc2dc586c8544d17263428c5556929303a64
Auto-generated-cl: translation import
2015-07-13 10:34:33 -05:00
Jason Monk
23a8ed802d Show volume restriction toast on all users
Bug: 21642285
Change-Id: I18ed4036543e1f13cd3010b9e1d790b16aa8e7a0
2015-07-13 11:02:13 -04:00
Jason Monk
33b60bb45f Fix demo mode issues
Bug: 22387423
Change-Id: I7b0b4ca75bae12a9fb3a90ab804b263e8d982b46
2015-07-13 10:42:23 -04:00
Rubin Xu
cf9aebf138 Merge "Remove ExternalStorageFormatter" into mnc-dev 2015-07-13 13:55:53 +00:00
Julia Reynolds
9a5c9118ce Remove personal/device group from sideloading screen.
Also ignore the requestedPermissionFlags of yet to be installed
packages when trying to determine if a permission is new.

Bug: 22229417

Change-Id: I59d579cdc42d64bcfdefdb06e1576959355bb7a4
2015-07-13 08:46:29 -04:00
Andrei Stingaceanu
cfa13a77ed Fix insertion handle disappearing in extract mode
In extract mode, on every screen touch
TextView#setExtractedText gets called which calls
SpannableStringBuilder#sendTextChanged which in turn stops
the action mode. As a fix, if the text is the same only
copy the spans without replacing everything.

Bug: 22315095
Change-Id: I28da760b3dc11e1cfbaf720e547bd817c5b89d7e
2015-07-13 11:14:43 +01:00
Esteban Talavera
0ec43f89d2 Merge "Use correct user when filtering app link candidates" into mnc-dev 2015-07-13 09:48:48 +00:00
Esteban Talavera
2292160320 Merge "Don't send app links to parent profile if status == never" into mnc-dev 2015-07-13 09:48:21 +00:00
Wale Ogunwale
3f529ee7fa Finish already paused activity if it should be finished after pausing
If the app requests its activity to be finished allow it to be finished
immediately if the activity is already paused.

Also, don't schedule stop for an activity that was already finished in
ActivityStack.stopActivityLocked().

Bug: 22170595
Bug: 22397812
Change-Id: If349f7d3070a1fd2c0688fda7381b42f625ed9e4
2015-07-12 15:14:01 -07:00
Billy Lau
96d00ab359 Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 2015-07-12 22:02:37 +00:00
Billy Lau
22b3f4cb15 Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag. Also made sure that this
permission is not added as RuntimePermission in DefaultPermissionGrantPolicy as
that breaks a lot of gmscore stuff.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: Ifd25a6ddc06de68ee37015cb9fb23452e4ef10f4
2015-07-12 22:41:00 +01:00
Aravind Akella
11fce8e8c5 Log full class name of the client activating sensors for better debugging.
Bug: 22076400
Change-Id: Ibb8e72cfb031651e803f2eaf4b6530f809c00b6b
2015-07-12 11:56:25 -07:00
Zhijun He
4fb81253ed Camera metadata: fix typos.
Bug: 22417740
Change-Id: I871b990da43132f4967faf7ee23a9a2d962c4320
2015-07-11 20:03:52 -07:00
Geoff Mendal
1962ad3e09 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-11 19:01:51 +00:00
Geoff Mendal
27963efe42 Import translations. DO NOT MERGE
Change-Id: I59264674ef40a0f68a80c0ca9973e3aba2c06db1
Auto-generated-cl: translation import
2015-07-11 10:35:45 -07:00
Amith Yamasani
2d42d5f41e Check user state after clearing identity.
This is to fix the case where the caller has GRANT_REVOKE_PERMISSIONS
but does not have MANAGE_USERS permission.

Related to a recent fix for
Bug: 22356546

Change-Id: Id51157abad14a0bdba3a16d7cd168f61ba25e890
2015-07-11 10:24:45 -07:00
Geoff Mendal
d64ba82e89 Import translations. DO NOT MERGE
Change-Id: I69aef7f3e9d819732675c4103553a6afe4b062b3
Auto-generated-cl: translation import
2015-07-11 06:47:43 -07:00
Raph Levien
1b3d03512e Merge "Improve Html.toHtml() documentation" into mnc-dev 2015-07-11 06:09:12 +00:00
David Friedman
5c3bf5847c am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit 'e0f0fabbb1a416d71677fe7d9692530023cd53ec':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 03:19:07 +00:00
David Friedman
e0f0fabbb1 am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit 'ccb8a9af1cf4c392b05ec7654d2a7213c8ef4019':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 03:06:00 +00:00
David Friedman
ccb8a9af1c am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit 'b510225e44742d488beb7dcf0248c9ba9b4010c9':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-11 02:53:54 +00:00
Jim Miller
9da440786d Change MANAGE_FINGERPRINT permission to system|signature
This allows fingerprint enrollment to be done from
system-installed apps, such as Setup Wizard.

Fixes bug 21695577

Change-Id: I990912dcf229aa03f6350f96a09ff4588b20ca48
2015-07-10 19:48:53 -07:00
David Friedman
b510225e44 Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs 2015-07-11 02:41:13 +00:00
Amith Yamasani
292eb65f1e Merge "Fix new user creation regression due to vold remount calls" into mnc-dev 2015-07-11 02:28:01 +00:00
Amith Yamasani
5449ee0786 Merge "Avoid IPC call with an empty array" into mnc-dev 2015-07-11 02:27:33 +00:00
Sanket Padawe
233bd3ceff Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 2015-07-11 01:46:33 +00:00