Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,704 Commits 3 Branches 0 Tags
48c78cfb9e9c055ee97be0aaac02832f758ee396
Commit Graph

27498 Commits

Author SHA1 Message Date
Erik Kline
68bc390c0a am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev 
* commit '776129402746be08d52bb9f0901f6ecd63b25399':
  Log NetworkRequestInfo to get more detailed history
 2015-07-14 06:07:04 +00:00
Svet Ganov
4248250c93 am 8017c647: Fix build 
* commit '8017c647e665a6b6240501dc43628143ebe4e333':
  Fix build
 2015-07-14 06:06:55 +00:00
Ian Pedowitz
d7be214ca4 resolved conflicts for merge of 8cee6587 to mnc-dr-dev 
Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3
 2015-07-13 22:58:29 -07:00
Erik Kline
7761294027 Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev 2015-07-14 04:09:29 +00:00
Erik Kline
7523eb349e Log NetworkRequestInfo to get more detailed history 
Bug: 21641983
Bug: 22235775
Bug: 22299819
Bug: 22358164
Change-Id: I48a2d162dd499a3590f06d805267a63822856969
 2015-07-14 11:46:51 +09: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
c5eadf8d88 am 4b9b3e47: Merge "Default browser should not supersede intent filter priorities" into mnc-dev 
* commit '4b9b3e4731ffb962daf0f5029450001a8a6e7c00':
  Default browser should not supersede intent filter priorities
 2015-07-14 01:18:19 +00:00
Svet Ganov
7ca0c42db5 am fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev 
* commit 'fc2bc7f170ba564bc439fd22dd5a779d96670ffd':
  Check signatures of privileged persistent apps for granting defailt  permissions
 2015-07-14 01:11:54 +00: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
Christopher Tate
b4494b02d5 am 288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev 
* commit '288ecf98f14c9eff639b0a3de074d5b4a06eccec':
  Prioritize most-recently-enabled link-handling app
 2015-07-14 00:59:52 +00:00
Svetoslav
72172933d7 am 56c59d15: Merge "Fix two grant default permissions edge cases." into mnc-dev 
* commit '56c59d1550703bc96151dc53bb4b697fda6a6028':
  Fix two grant default permissions edge cases.
 2015-07-14 00:59:47 +00: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
Jinsuk Kim
7acee9353b am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev 
* commit 'e249eb3a6f33ee945113a8f11e8382e70c4e066f':
  Perform One touch play upon pressing home key
 2015-07-14 00:15:19 +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
Jinsuk Kim
e249eb3a6f Merge "Perform One touch play upon pressing home key" into mnc-dev 2015-07-13 23:45:03 +00:00
Amit Mahajan
66eb1ad11e am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev 
* commit '53e5ba22c1694fad23b67d18c42c01d6deada5f6':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.
 2015-07-13 23:03:34 +00:00
Wale Ogunwale
eb2153c700 am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit '093d8de298c258943ca79c1cf429f5ef5725d1bb':
  Finish already paused activity if it should be finished after pausing
 2015-07-13 23:02:52 +00:00
Etan Cohen
686be93854 am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev 
* commit 'c09544bb88ada53494d4a955d0450a22985b4799':
  Fix filter on CONNECTIVITY_ACTION updates
 2015-07-13 23:02:07 +00:00
Amith Yamasani
7efb0521ff am 1578357d: Merge "Check user state after clearing identity." into mnc-dev 
* commit '1578357df737296aa151c6934fe7dd749a43ae15':
  Check user state after clearing identity.
 2015-07-13 23:02:03 +00:00
Esteban Talavera
f463ac6647 am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev 
* commit '0ec43f89d2fc7064e7b42b40b318bef15fb040b5':
  Use correct user when filtering app link candidates
 2015-07-13 23:01:05 +00:00
Esteban Talavera
4b1145759b am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev 
* commit '2292160320f29144f8f8f38bd6936e9f1efb4ae5':
  Don't send app links to parent profile if status == never
 2015-07-13 23:01:01 +00:00
Billy Lau
f028ba3db3 am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit '96d00ab359d60197321f06b4feb3d01f3fa03a29':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-13 23:00:54 +00:00
Amith Yamasani
0fd2d2b124 am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev 
* commit '292eb65f1ee0747e60899c1b1d0b6cb16c9cd37a':
  Fix new user creation regression due to vold remount calls
 2015-07-13 22:45:33 +00:00
Wale Ogunwale
6ede9b679e am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev 
* commit '26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0':
  Revert "Finish already paused activity if it should be finished after pausing"
 2015-07-13 22:29: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
Paul Crowley
bac3d0936d Merge "Delete the user key when deleting a user." into mnc-dr-dev 2015-07-13 20:53:57 +00:00
Paul Crowley
9e0e69915a Merge "Use mount service to create user dirs." into mnc-dr-dev 2015-07-13 20:53:09 +00: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
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
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
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
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
Svet Ganov
824d453246 Check signatures of privileged persistent apps for granting defailt permissions 
bug:22391058

Change-Id: I56d060f0435fadf87a8cf255ea887dd5b3903821
 2015-07-10 18:28:52 -07:00
Amit Mahajan
1cfd45701b Do not check runtime READ_PHONE_STATE if caller has the privileged one. 
Also removed READ_PHONE_STATE from SystemUI since it has
READ_PRIVILEGED_PHONE_STATE.

Bug: 22376654
Change-Id: I437f9bf324950cb70bae5be76699824da5897a6f
 2015-07-10 17:15:59 -07:00
Robert Greenwalt
3ac71b7f87 Fix filter on CONNECTIVITY_ACTION updates 
Only send for network types which the network supports.

bug:22411968
Change-Id: I97765544eb653caf0ea4fc5d3feec5742d5d88dc
 2015-07-10 16:26:40 -07:00
Wale Ogunwale
26b0f1e420 Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev 2015-07-10 22:53:14 +00:00
Wale Ogunwale
12bb956828 Revert "Finish already paused activity if it should be finished after pausing" 
This reverts commit bef8a3e393.

Changed caused some existing apps to crash. Reverting to unblock the
build while I investigate.

Bug: 22170595
Bug: 22397812
 2015-07-10 15:25:38 -07:00
Jorim Jaggi
0c758805b3 Merge "Fix empty keyguard for once and all" into mnc-dev 2015-07-10 21:16:26 +00:00
Jinsuk Kim
256642aa2f Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev 2015-07-10 21:09:14 +00:00