197296 Commits

Author SHA1 Message Date
Christopher Tate
f0d6cb38c4 Prioritize most-recently-enabled link-handling app
In the case when multiple apps handle a given web-link action,
all of which have been marked as "launch the app instead of a
browser" and so are otherwise ambiguous, always prefer the app
that was most recently placed into the always-handle-links state.

Bug 22051035

Change-Id: I3f43c19b0d7b74e9843445e41971bb5433affb1c
2015-07-13 17:01:14 -07:00
Robert Schaub
fd186d20c5 am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '28006a3b31d1cd3765568ceed211f8bc8de9c50c':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup
2015-07-13 23:58:09 +00:00
Robert Schaub
0b403ebd6a am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '1962b730067d5b9ad9666ee3a7d1e3f90004c7d7':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
2015-07-13 23:58:03 +00:00
David Friedman
91a44578e4 am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '5c3bf5847c98b23a525288ed04f77b2a68ec6870':
  docs: replacing command line tool instructions with Studio and Monitor steps
2015-07-13 23:57:52 +00:00
Eric Gilmore
908c50a172 am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit 'f13e914d23a47809d978183a8e6b6ab3a5d51098':
  Adding a link to what is currently our most popular "100 Days" video.
2015-07-13 23:57:43 +00:00
George Mount
a340f07670 Add data binding to built javadoc.
Bug 22175560

Change-Id: Ie57e0b77cade4b994ca2ef80cbf1a4c615a943f8
2015-07-13 16:45:34 -07:00
Jinsuk Kim
e249eb3a6f Merge "Perform One touch play upon pressing home key" into mnc-dev 2015-07-13 23:45:03 +00:00
Robert Schaub
2b856100f6 Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs 2015-07-13 23:41:29 +00:00
Selim Cinek
7025f26a99 Removed logging for the empty keyguard
Only logging the states in the bugreport now.

Bug: 21701756
Change-Id: I8252583300d0162b878dd217c8098c1d6b970ea4
2015-07-13 16:26:29 -07:00
Robert Schaub
28006a3b31 am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '7182f075fad7865eb8c1ce58d90327addabc7c4b':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup
2015-07-13 23:23:48 +00:00
Robert Schaub
1962b73006 am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '3430bec7e0b2f7a0552a66a523e478cd2ecd9043':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
2015-07-13 23:23:43 +00:00
Robert Schaub
2c5d93ae5f docs: Removed references to lockscreen widgets, added note to Android 5.0
changes page

Removed one line from source code sample as well.

Bug: 20826638
Change-Id: I3c27353db0f0092c21962f9beec1bf1da52ee9d5
2015-07-13 16:19:08 -07:00
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