Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,099 Commits 3 Branches 0 Tags
ab62b377d75f52887f7721ecabdf3fe22abcb0ec
Commit Graph

245099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomasz Mikolajewski
ab62b377d7 Merge "Fix opening archives in Downloads." into nyc-dev am: c58e561 
am: c04abbe

* commit 'c04abbed417a8aa613b97c2bef0ac3983601f337':
  Fix opening archives in Downloads.

Change-Id: Ibba2e28c8a4238869bf342b80ebf1b9dbd1d66d9
 2016-04-11 06:42:49 +00:00
Rakesh Iyer
c114a4a4bc resolve merge conflicts of 7f1c408 to master 
Change-Id: Ice4ce8394986fb8cb5992d724d8667a30d02e2fa
 2016-04-10 23:03:37 -07:00
Tomasz Mikolajewski
c04abbed41 Merge "Fix opening archives in Downloads." into nyc-dev 
am: c58e561

* commit 'c58e5619d32a6d3351248de31e102eb37f8c61fd':
  Fix opening archives in Downloads.

Change-Id: I98d49dd799919af391d329da58ccabde3088d6cf
 2016-04-11 03:07:31 +00:00
Tomasz Mikolajewski
c58e5619d3 Merge "Fix opening archives in Downloads." into nyc-dev 2016-04-11 03:00:12 +00:00
Anthony Chen
7f1c4089e7 Merge "For Auto, display battery status as that of a connected device." into nyc-dev 
am: ab713b9

* commit 'ab713b9c37cfb838d5228f1901a798494048e231':
  For Auto, display battery status as that of a connected device.

Change-Id: Ibdff2a3355926c67fa9c145f92838b54a7084b50
 2016-04-11 02:58:07 +00:00
Anthony Chen
ab713b9c37 Merge "For Auto, display battery status as that of a connected device." into nyc-dev 2016-04-11 02:51:57 +00:00
Svetoslav Ganov
07a7562453 Merge "Revert "Keep read/write external storage as built-in permissions"" into nyc-dev am: cf45224 
am: c863e2d

* commit 'c863e2d92dca4a6b93aacab92514aa295174ede6':
  Revert "Keep read/write external storage as built-in permissions"

Change-Id: I5cf479e3d5f4a79c8da773064807d60715d92fc3
 2016-04-10 03:17:07 +00:00
Svetoslav Ganov
c863e2d92d Merge "Revert "Keep read/write external storage as built-in permissions"" into nyc-dev 
am: cf45224

* commit 'cf45224a81272d783314a77fd8671d711f4c6a68':
  Revert "Keep read/write external storage as built-in permissions"

Change-Id: Iabd1b7c0553ddebca5908ecb511710f2d6b685a7
 2016-04-10 03:13:35 +00:00
Svetoslav Ganov
cf45224a81 Merge "Revert "Keep read/write external storage as built-in permissions"" into nyc-dev 2016-04-10 03:03:51 +00:00
Svetoslav Ganov
6061c3be3a Revert "Keep read/write external storage as built-in permissions" 
This reverts commit 4086750e30.

Change-Id: I5f0d8e2920e523b4806da1cca3dc73b1c0354015
 2016-04-10 03:03:33 +00:00
Jeff Sharkey
2278e7206b Merge "More freezing of apps when doing surgery." into nyc-dev am: 4a01bb7 
am: 663bcdd

* commit '663bcdd8e17587b95f1f8810044606eee0320526':
  More freezing of apps when doing surgery.

Change-Id: I009a6bc395141ab80fbe3efe48fefc0932d1a5cd
 2016-04-10 01:20:02 +00:00
Jeff Sharkey
663bcdd8e1 Merge "More freezing of apps when doing surgery." into nyc-dev 
am: 4a01bb7

* commit '4a01bb7d9f0f3f52c2c4d7891169a75e2e21c484':
  More freezing of apps when doing surgery.

Change-Id: I5755a39f58e0b9ffe01acee7cee6ff9d844d95ef
 2016-04-10 01:16:36 +00:00
Jeff Sharkey
4a01bb7d9f Merge "More freezing of apps when doing surgery." into nyc-dev 2016-04-10 01:11:07 +00:00
Yohei Yukawa
a110c56a28 Merge "Revert "Customizes input extract edit view for Wear"" into nyc-dev am: 6feeedc 
am: 92afb12

* commit '92afb12a7b9a263f9500b87ff48c0a3c8dff5740':
  Revert "Customizes input extract edit view for Wear"

Change-Id: I44bd900c1bd896f71cfcdadfd599a822520a1032
 2016-04-10 00:51:08 +00:00
Yohei Yukawa
92afb12a7b Merge "Revert "Customizes input extract edit view for Wear"" into nyc-dev 
am: 6feeedc

* commit '6feeedc72b582f042986218185877ddda49c867b':
  Revert "Customizes input extract edit view for Wear"

Change-Id: Ic1927a81dd1da61e62eb106a92064cc4c6955277
 2016-04-10 00:47:42 +00:00
Yohei Yukawa
6feeedc72b Merge "Revert "Customizes input extract edit view for Wear"" into nyc-dev 2016-04-10 00:39:29 +00:00
Jeff Sharkey
d4041db120 More freezing of apps when doing surgery. 
We're still hearing rare reports of apps running while the system
is trying to do surgery on app code/data.  To fix this once and for
all, start guarding all PackageManager critical sections by freezing
and then killing the app before doing surgery.

This is done by introducing a new PackageFreezer class which can be
used in try-with-resources blocks.  It also handles child packages
uniformly, and it uses CloseGuard to defensively un-freeze packages
if a caller leaks without closing.

The set of frozen packages is now maintained outside of PackageSetting
to support newly installed packages.  Add docs for the various locks
and method syntax conventions, including the new "LIF" syntax which
indicates the caller is responsible for freezing the package being
worked on.

Bug: 27698554
Change-Id: I64c4c48123060ccb4d4c50c2fbf3ef223c01e659
 2016-04-09 17:25:06 -06:00
Jeff Sharkey
c518ca7e63 Revert "Keep read/write external storage as built-in permissions" am: 8ed9ece 
am: ae4a31f

* commit 'ae4a31f6ec2de7a537681022a93803cbc56716cb':
  Revert "Keep read/write external storage as built-in permissions"

Change-Id: I319b7356e0a314ce2e1b2cd68dbe77b69761e5f5
 2016-04-09 23:15:53 +00:00
Jeff Sharkey
ae4a31f6ec Revert "Keep read/write external storage as built-in permissions" 
am: 8ed9ece

* commit '8ed9ece93dca5c7266ca7d9c5fabe7c9a6b214e7':
  Revert "Keep read/write external storage as built-in permissions"

Change-Id: Ic52bb816d564076999ab7a220fd70a52228731b1
 2016-04-09 23:08:52 +00:00
Jeff Sharkey
fc24ea7c77 Add missing method called from native code. am: edd11f5 
am: 060e035

* commit '060e035caf9d811be95e8446c9ac39339db9b7f7':
  Add missing method called from native code.

Change-Id: Ibf3f6ecf196032ff36f345576f3c703dc2bfec2c
 2016-04-09 22:51:57 +00:00
Svetoslav Ganov
c43928546f Merge "Keep read/write external storage as built-in permissions" into nyc-dev am: 30f3759 
am: 2773d6d

* commit '2773d6d520772677d5523bd567ada354a557494f':
  Keep read/write external storage as built-in permissions

Change-Id: I6880118a3b090ddb9e3668aa531386ff20de7452
 2016-04-09 22:51:56 +00:00
Bill Yi
5742a5c644 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 6f3934e -s ours 
am: 6f9fc84  -s ours

* commit '6f9fc84aeadfcdc0456eedaa85823f4cd36eba67':
  Import translations. DO NOT MERGE

Change-Id: I1d282c697c3a69b2811f7f1d36ebcbe959335b11
 2016-04-09 22:51:53 +00:00
Bill Yi
095a3f3fbf Merge "Import translations. DO NOT MERGE" into nyc-dev am: 575df07 -s ours 
am: eff9e2b  -s ours

* commit 'eff9e2b58b35329ec7400b67cf2634ecbac9a82e':
  Import translations. DO NOT MERGE

Change-Id: I678669b22588fcfb97ee3186062c500fa466c0de
 2016-04-09 22:51:50 +00:00
Bill Yi
b4146affdb Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3a82ab0 -s ours 
am: 92f8f33  -s ours

* commit '92f8f339f1be5c38015cb6b7bf26cc9c5be7f2c9':
  Import translations. DO NOT MERGE

Change-Id: I6a701e1d0dc3c690b6c15c4dceb29fbf3dca6805
 2016-04-09 22:51:46 +00:00
Bill Yi
9246f0d8b5 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 544c68a -s ours 
am: 70e477d  -s ours

* commit '70e477de0d4aea48b3768d1013453a52ccdd7ee4':
  Import translations. DO NOT MERGE

Change-Id: I2dd2480906a467df4cd8b2600652fb8a1d785c57
 2016-04-09 22:51:40 +00:00
Bill Yi
7ad92fb00e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9af0c89 -s ours 
am: e260436  -s ours

* commit 'e2604363496166c8f043e7d0527c827f1ff0a738':
  Import translations. DO NOT MERGE

Change-Id: Iffacf6506cf30e3e1c41e4252da3999e80ebc65e
 2016-04-09 22:51:34 +00:00
Bill Yi
69bd2ab0a4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2264059 -s ours 
am: e1db1c2  -s ours

* commit 'e1db1c2b65dcf1be4751be68eaaa3245cbc5d285':
  Import translations. DO NOT MERGE

Change-Id: I55442395d989755b41865f2f55e537693fc173c3
 2016-04-09 22:51:27 +00:00
Lorenzo Colitti
d61d39db7e Merge "More APF debuggability." into nyc-dev am: 6ad205b 
am: 5ccb905

* commit '5ccb905f14f0beb3562b29fa3843ee5ed6883702':
  More APF debuggability.

Change-Id: Id402519531fea932779d65bfe4fbab9617b915c5
 2016-04-09 22:51:19 +00:00
Jorim Jaggi
8440efc1ae Merge "Disable snap targets that make apps <220dp" into nyc-dev am: c3769ae 
am: d6444fc

* commit 'd6444fc78b5e1a2e456ba61b72b3042278293314':
  Disable snap targets that make apps <220dp

Change-Id: I25fa01108114884214859ee963eb50dbb3b15491
 2016-04-09 22:51:09 +00:00
Yohei Yukawa
757224008e Revert "Customizes input extract edit view for Wear" 
This reverts commit 880602eb64 [1],
which was committed with a wrong author email address and lacked license
notice in some files.  To avoid confusion, this we decided to
temporarily revert that CL so that we can commit it with proper license
notice and author address again.

 [1]: I16226ce393f2d15065d08e66a36d008eb1a0c8a1

Bug: 22512982
Bug: 28098677
Change-Id: I3dd3c7bf0ee9634fc4f3bf433bf5023675873e46
 2016-04-09 15:24:02 -07:00
Jeff Sharkey
8ed9ece93d Revert "Keep read/write external storage as built-in permissions" 
This reverts commit 4086750e30.
 2016-04-09 16:12:01 -06:00
Jeff Sharkey
060e035caf Add missing method called from native code. 
am: edd11f5

* commit 'edd11f50c684a7f4c27b97ff381910a23a999fa3':
  Add missing method called from native code.

Change-Id: I7834d6bb96cd15c085706c360f00915760aff459
 2016-04-09 21:57:10 +00:00
Jeff Sharkey
edd11f50c6 Add missing method called from native code. 
Without this method, boot would fail.

Bug: 28093387
Change-Id: I304d48bbf3ea24ce6af3b5a71c60b8ed06be38e1
 2016-04-09 15:48:46 -06:00
Svet Ganov
2773d6d520 Merge "Keep read/write external storage as built-in permissions" into nyc-dev 
am: 30f3759

* commit '30f37594e02e09903c56e1325cec85081f2aadb8':
  Keep read/write external storage as built-in permissions

Change-Id: If7a68c832d07d204bb18ae6ce5008433c8cce328
 2016-04-09 20:25:56 +00:00
Svetoslav Ganov
30f37594e0 Merge "Keep read/write external storage as built-in permissions" into nyc-dev 2016-04-09 20:16:13 +00:00
Svet Ganov
4086750e30 Keep read/write external storage as built-in permissions 
These are permissions that were mapped to gids but we need
to keep them listed event though they are no longer mapped
to gis until an upgrade from L to the current version is to
be supported. These permissions are built-in and in L were
not stored in packages.xml as a result if they are not defined
in the platform.xml while parsing packages.xml we would
ignore these permissions being granted to apps and not
propagate the granted state. From N we are storing the built-in
permissions in packages.xml as the saved storage is negligible
(one tag with the permission) compared to the fragility as one
can remove a built-in permission which no longer needs to be
mapped to gids and break grant propagation.

bug:27185272

Change-Id: I440f6ceb7bc4710dece1a2fadabc995b18fc2a83
 2016-04-09 13:05:26 -07:00
Bill Yi
6f9fc84aea Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 6f3934e  -s ours

* commit '6f3934ea1ce9845be4a19f6e451d222f591c5fa2':
  Import translations. DO NOT MERGE

Change-Id: I8fc96d5a0b49d08ec840ce917d77078520c0ef2d
 2016-04-09 14:05:57 +00:00
Bill Yi
eff9e2b58b Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 575df07  -s ours

* commit '575df07b96368683ad4bf36e44b42b5d93fdd9f9':
  Import translations. DO NOT MERGE

Change-Id: I5115a6c119a3e206924dc370cd3483ff39c7bf4e
 2016-04-09 14:05:56 +00:00
Bill Yi
92f8f339f1 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 3a82ab0  -s ours

* commit '3a82ab0e920c58cb19dd5af32d6f5c85a7d640dd':
  Import translations. DO NOT MERGE

Change-Id: I2f91b9e7f7213e6af03b396bc0e5aa1475b16206
 2016-04-09 14:05:54 +00:00
Bill Yi
df061dd1f2 Merge "Import translations. DO NOT MERGE" 2016-04-09 14:03:56 +00:00
Bill Yi
6f3934ea1c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-09 14:02:02 +00:00
Bill Yi
944f8923af Merge "Import translations. DO NOT MERGE" 2016-04-09 14:01:37 +00:00
Bill Yi
575df07b96 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-09 14:00:25 +00:00
Bill Yi
70e477de0d Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 544c68a  -s ours

* commit '544c68ade88e9cf00ae80134e6cefedb18eb01c6':
  Import translations. DO NOT MERGE

Change-Id: I98974cec810c6226c50a5fd843d850a3439a369f
 2016-04-09 14:00:01 +00:00
Bill Yi
e260436349 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 9af0c89  -s ours

* commit '9af0c89da7166048a1e38ea4c65a7ecb788ea94c':
  Import translations. DO NOT MERGE

Change-Id: I2b076c29cb2ca395a9067745865229bb3bf00f65
 2016-04-09 14:00:00 +00:00
Bill Yi
e1db1c2b65 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2264059  -s ours

* commit '2264059fafb495c0b395f8046f2ebc3374c94132':
  Import translations. DO NOT MERGE

Change-Id: Icbd9fd9fec49b676b173fb49849a0188992873b6
 2016-04-09 13:59:59 +00:00
Bill Yi
3a82ab0e92 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-09 13:56:38 +00:00
Bill Yi
544c68ade8 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-09 13:56:22 +00:00
Bill Yi
9af0c89da7 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-09 13:56:07 +00:00
Bill Yi
2264059faf Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-09 13:55:42 +00:00