Commit Graph

50395 Commits

Author SHA1 Message Date
Svet Ganov
fc72ce8bbd am 49316d83: am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
* commit '49316d83d518110c64fab92c423ebd263ee3b7cf':
  Installer is a part of the system with unrevocable permissions
2015-06-30 19:56:47 +00:00
Svet Ganov
49316d83d5 am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev
* commit 'ab4f6ff013860e5fbb72542d9c47165a47244b0f':
  Installer is a part of the system with unrevocable permissions
2015-06-30 19:44:27 +00:00
Svet Ganov
4a23ac4589 Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 2015-06-30 19:24:05 +00:00
Maxim Bogatov
16f3e55df8 am b0c1485d: am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev
* commit 'b0c1485d4119e87507093892e0b1d96f777f5c55':
  Let TextView clear accessibility selection index
2015-06-30 19:19:29 +00:00
Maxim Bogatov
b0c1485d41 am 24815124: am 7a2e4b8f: Merge "Let TextView clear accessibility selection index" into mnc-dev
* commit '24815124600a12a9a0ef1d7a8883ab2c8e5c1525':
  Let TextView clear accessibility selection index
2015-06-30 19:07:50 +00:00
Maxim Bogatov
7a2e4b8f80 Merge "Let TextView clear accessibility selection index" into mnc-dev 2015-06-30 18:45:52 +00:00
Svet Ganov
3fc85e6f1a am fb498a31: am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev
* commit 'fb498a311df525953900c0a186d3765e3a37ac56':
  Add read/write external storage app ops
2015-06-30 17:37:04 +00:00
Svet Ganov
fb498a311d am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev
* commit 'c5c8995510943527f99e51b04809dae090f0c2ab':
  Add read/write external storage app ops
2015-06-30 17:23:30 +00:00
Svet Ganov
6a166af8fd Installer is a part of the system with unrevocable permissions
1. Mark the installer permissions as not revocable.

2. Make the permission result dispatch more robust to handle installer death.

bug:22012614

Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
2015-06-30 10:15:49 -07:00
Svet Ganov
b24ff7e03a Merge "Add read/write external storage app ops" into mnc-dev 2015-06-30 16:50:17 +00:00
George Mount
19accae7b3 am 7f8f9e5b: am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
* commit '7f8f9e5b1372d44caf94186b4dfeaaa508a4b216':
  Fix FragmentTransaction replace() behavior
2015-06-30 14:57:46 +00:00
George Mount
7f8f9e5b13 am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev
* commit 'aa315dbb361e447b6442efc562b41d9b6fedf4e4':
  Fix FragmentTransaction replace() behavior
2015-06-30 14:45:46 +00:00
George Mount
0303d9ce70 Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 2015-06-30 14:21:49 +00:00
Kenny Guy
679a5af472 am 2b3eccae: am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev
* commit '2b3eccaec6eb43530d3a693ffe9310031e05e592':
  Deprecate APIs for admin to create users.
2015-06-30 13:36:49 +00:00
Kenny Guy
2b3eccaec6 am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev
* commit 'd0418e8cf9a250183a2fc3d7474f82dc9e2da734':
  Deprecate APIs for admin to create users.
2015-06-30 13:25:21 +00:00
Kenny Guy
31659c253e Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-30 13:03:32 +00:00
Billy Lau
28aad8efe6 am 67dfa491: am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
* commit '67dfa49194cf91241ff791730bacb71e07530ef3':
  Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
2015-06-30 10:12:46 +00:00
Esteban Talavera
c4bb8de0d2 am 283b7ace: am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
* commit '283b7ace805d9afd972cccf906a241c34761c7af':
  Marking some globals from setGlobalSetting as not supported
2015-06-30 10:12:40 +00:00
Billy Lau
67dfa49194 am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
* commit 'e4c3fd725ea8870756428a6580052a34fc676299':
  Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
2015-06-30 09:56:15 +00:00
Esteban Talavera
283b7ace80 am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev
* commit '37fd8bd182c110b98772876f3fa47cc4d54042bc':
  Marking some globals from setGlobalSetting as not supported
2015-06-30 09:56:10 +00:00
Benjamin Franz
932765b45b am aa2b7910: am adb41d8f: am 01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev
* commit 'aa2b79107918adfe2fbfc7d40dd17845b4739999':
  Make ContentObservers work across profiles
2015-06-30 09:47:14 +00:00
Billy Lau
f62f4c94a3 Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 2015-06-30 09:05:34 +00:00
Esteban Talavera
fef8cbd6a6 Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 2015-06-30 08:55:38 +00:00
Benjamin Franz
aa2b791079 am adb41d8f: am 01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev
* commit 'adb41d8f6cfb2f33240c11cc6850994579952ea1':
  Make ContentObservers work across profiles
2015-06-30 08:00:48 +00:00
Benjamin Franz
01b079f7d2 Merge "Make ContentObservers work across profiles" into mnc-dev 2015-06-30 07:45:50 +00:00
Erik Kline
476501875b am f2a08d05: am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev
* commit 'f2a08d054cdc301eb66c957f9ae05307d1e1f215':
  Fix use of reachable DNS server logic
2015-06-30 07:06:06 +00:00
Erik Kline
f2a08d054c am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev
* commit '49aeed9f3fe7d8e7af2fff549587546dfe4361d1':
  Fix use of reachable DNS server logic
2015-06-30 06:55:42 +00:00
Erik Kline
5f950417f6 Merge "Fix use of reachable DNS server logic" into mnc-dev 2015-06-30 06:32:23 +00:00
Andreas Gampe
60b5cabb4c am 9958e75b: am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
* commit '9958e75b51029fca7bd130e37c5d5b3ca24e2788':
  Frameworks/base: Remove UsageEvents finalizer
2015-06-30 06:12:40 +00:00
Andreas Gampe
9958e75b51 am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev
* commit '97378a628bc7edeb109af2bae32ec920970158bb':
  Frameworks/base: Remove UsageEvents finalizer
2015-06-30 05:58:53 +00:00
Andreas Gampe
6feb4301eb Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 2015-06-30 05:40:08 +00:00
Andreas Gampe
373fb40947 Frameworks/base: Remove UsageEvents finalizer
The order of finalization between the parcel and the UsageEvents
objects is not defined. In the bad case, the parcel will be
finalized first and destroy its native pointer, after which the
UsageEvents object will recycle it, putting it back into one of
the Parcel pools. This will violate the pool invariant.

Bug: 22088355
Change-Id: Ifbe7822990cdfc31855d6742dcdea9d9dd0daf1b
2015-06-29 22:07:30 -07:00
Svet Ganov
921c7dfc80 Add read/write external storage app ops
bug:22104418

Change-Id: Ic9088f95bc02622c1163c1393e44382df6597707
2015-06-29 21:51:45 -07:00
Erik Kline
b36a3131d1 Fix use of reachable DNS server logic
Move reachable DNS server computation out of ConnectivityService
and split it into LinkProperties#isReachable() and a companion
change in WifiStateMachine's makeLinkProperties().

Restore previous ConnectivityService#updateDnses() behaviour, as
the pruning is done in WifiStateMachine now.

Bug: 19470192
Bug: 20733156
Bug: 22098233
Change-Id: I810ef74d504e5dc1ca2017d435cdadd6b82171e6
2015-06-30 12:12:37 +09:00
Svetoslav
ee4e4e79f5 am 358a8362: am ae45cfa6: am 03b5f128: Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev
* commit '358a8362781736a8ddaa27713a0727d4eac1cfd0':
  Grant default permissons to the default SMS, Phone, Browser app.
2015-06-30 01:22:42 +00:00
Svetoslav
358a836278 am ae45cfa6: am 03b5f128: Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev
* commit 'ae45cfa632b4bce14b59c874596f6b076e68402d':
  Grant default permissons to the default SMS, Phone, Browser app.
2015-06-30 01:07:52 +00:00
Jorim Jaggi
d3e57ba2a5 am 5d574062: am 1d4419e3: am e85da2ba: Add accessibility event for assist disclosure
* commit '5d5740626b907aaa85049c2ac95e823d81d3262a':
  Add accessibility event for assist disclosure
2015-06-30 01:05:02 +00:00
Jorim Jaggi
a8a1877e78 am 9788eb83: am 778dccb8: am 825c2a00: Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev
* commit '9788eb83d69ac3000d88af50b11d777951a55f41':
  Add setting to disable screenshot separately (1/2)
2015-06-30 01:04:57 +00:00
Jorim Jaggi
5d5740626b am 1d4419e3: am e85da2ba: Add accessibility event for assist disclosure
* commit '1d4419e3c2067151baa9010f8bda98653c43cfc8':
  Add accessibility event for assist disclosure
2015-06-30 00:49:35 +00:00
Jorim Jaggi
9788eb83d6 am 778dccb8: am 825c2a00: Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev
* commit '778dccb865f5fbc6e6124009e343c9b5b6be87a8':
  Add setting to disable screenshot separately (1/2)
2015-06-30 00:49:30 +00:00
Svetoslav
03b5f128db Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev 2015-06-30 00:49:16 +00:00
Svetoslav
cdfd230a39 Grant default permissons to the default SMS, Phone, Browser app.
The default SMS, Phone, Browser are selected in the UI and we
grant default permissions to these. We do this regardless if
they are on the system image as the user has made an explicit
choice in the UI and the permission we grant are considered
essential for such type of a core app to operate properly.

bug:22104986

Change-Id: Ide8caeb524b43dde11a20460666cf34c4d35f84b
2015-06-29 17:44:19 -07:00
Jorim Jaggi
e85da2bad5 Add accessibility event for assist disclosure
Bug: 21568059
Change-Id: Ib51d4236fcc87acd54cb5d191197b9b2c6cc54ea
2015-06-30 00:27:14 +00:00
Christopher Tate
510ac7fcf0 am c2487836: am 46a23872: am c4c239bf: Merge "Don\'t crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev
* commit 'c2487836618e93e0e2e6f1ca42670ebb73e5c629':
  Don't crash in JNI: add DeadObjectException(String msg) ctor
2015-06-30 00:25:49 +00:00
Jorim Jaggi
825c2a006e Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev 2015-06-30 00:24:38 +00:00
Jorim Jaggi
a133f0b522 Add setting to disable screenshot separately (1/2)
Bug: 22063668
Change-Id: Ief704004a8ab0a65d34753f9098003ba695726df
2015-06-29 17:16:33 -07:00
Christopher Tate
c248783661 am 46a23872: am c4c239bf: Merge "Don\'t crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev
* commit '46a2387239d186d34cd9681bd404f03dfab67558':
  Don't crash in JNI: add DeadObjectException(String msg) ctor
2015-06-30 00:10:26 +00:00
Christopher Tate
e56db0e3fa Don't crash in JNI: add DeadObjectException(String msg) ctor
Bug 22104446

Change-Id: I0a538119269fe45955130e4e3d0d0bae8ee64993
2015-06-29 16:04:57 -07:00
Alan Viverette
cf3a3e1272 am 1537e135: am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev
* commit '1537e1358ea8446a1a512f1a15244355acda6d1a':
  Always remeasure ListView scrap used to obtain minimum width
2015-06-29 20:17:49 +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 ee76efb74b 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