197097 Commits

Author SHA1 Message Date
Zach Johnson
569ff225a3 Fix BluetoothSocket file descriptor leak
Sockets accepted on a server socket didn't populate
the mPfd field, which is used to close out the java
end of the native-and-java communication socket when
the overall rfcomm socket is closed. #badnewsbears

b/21398841

Change-Id: I3adb0a9965f83d0f3006fa4f79ea4abeab5c9a17
2015-07-14 03:40:49 +00:00
Svet Ganov
8017c647e6 Fix build
Change-Id: I2c97e405eaec7ee1569fcddc872ff2a98c829efe
2015-07-14 02:38:07 +00:00
Svet Ganov
8cee6587e0 Merge "Teach storage appops." into mnc-dev 2015-07-14 01:24:37 +00:00
Svet Ganov
6ee871e598 Teach storage appops.
For modern apps targeting M SDK and up the external storage state
is deterined by granted permissions. For apps targeting older SDK
the storage access is determined by app ops correspning to the
storage permissions as the latter are always granted.

When app ops change we do not remount as we kill the app process
in both cases enabling and disabling an app op since legacy code
is not prepared for dynamic behavior where an operation that failed
may next succeed. Hence, we remount when we start the app.

For modern apps we don't kill the app process on a permission
grant, therefore we synchronously remount the app storage.

bug:22104923

Change-Id: I601c19c764a74c2d15bea6630d0f5fdc52bf6a5a
2015-07-13 18:22:30 -07:00
Christopher Tate
4b9b3e4731 Merge "Default browser should not supersede intent filter priorities" into mnc-dev 2015-07-14 01:08:28 +00:00
Christopher Tate
d13cb79850 Default browser should not supersede intent filter priorities
Bug 22304850

Change-Id: Ie4deffea2621fdc03a9bfe35690ecd109eed1a04
2015-07-13 18:04:56 -07:00
Svet Ganov
fc2bc7f170 Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev 2015-07-14 00:58:38 +00:00
Christopher Tate
288ecf98f1 Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev 2015-07-14 00:56:58 +00:00
Svetoslav
56c59d1550 Merge "Fix two grant default permissions edge cases." into mnc-dev 2015-07-14 00:54:36 +00:00
Svetoslav
8b24a1d30f Fix two grant default permissions edge cases.
1. When querying for components to which to grant default
   permissions we are now getting disabled components as
   well as we want such packages to get default pemrissions
   on upgrade as disabled components may get reenabled.

2. When resolving activities to whose packages to grant default
   permissions we skip the corss-profile and skip-profile filters
   as they are set by device policy which should not affect
   implicitly default permission grants. Policy has explicit
   APIs for permission management.

bug:22405963

Change-Id: Idf56d35e567a6fd6e097cd45988d1561422ee6fc
2015-07-13 17:46:50 -07:00
Robert Schaub
9de5dcac95 am 70d39c28: am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '70d39c2836f3c05a93035439df0082b5c471c010':
  docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
2015-07-14 00:44:21 +00:00
Robert Schaub
70d39c2836 am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '2b856100f67da1505eac30e2d989b84a2d68f20a':
  docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
2015-07-14 00:26:21 +00:00
Jason Monk
9c2182e1b3 Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev 2015-07-14 00:10:11 +00:00
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
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
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
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
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
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
Esteban Talavera
0ec43f89d2 Merge "Use correct user when filtering app link candidates" into mnc-dev 2015-07-13 09:48:48 +00:00