Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,948 Commits 3 Branches 0 Tags
b2d48bc5ccfa3935cb01691b28d7608768315023
Commit Graph

6453 Commits

Author SHA1 Message Date
Dmitry Polukhin
91b3d8bf24 Merge "[Backup] Special handling for sharedpref files in backup config" 2015-08-25 18:06:15 +00:00
Xiaohui Chen
bd0e03bb76 More USER_OWNER cleanup. 
Bug: 19913735
Change-Id: I408a92d9dbab2a096407efccb91e2a8bdc22714d
 2015-08-24 16:42:37 +00:00
Adrian Roos
e3b07451c3 resolved conflicts for merge of bcc26c02 to master 
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
 2015-08-21 18:08:58 -07:00
Adrian Roos
bcc26c0201 am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker 
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
  Add StrongAuthTracker
 2015-08-22 00:40:47 +00:00
Adrian Roos
a8bbebd426 am b5e47228: Add StrongAuthTracker 
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
  Add StrongAuthTracker
 2015-08-22 00:16:48 +00:00
Adrian Roos
b5e4722891 Add StrongAuthTracker 
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
 2015-08-21 13:28:00 -07:00
Dmitry Polukhin
80e8db3d9c [Backup] Special handling for sharedpref files in backup config 
Allow specifying sharedpref without .xml suffix as it is for
getSharedPreferences Android API. If .xml extension is missing for
sharedpref file name, it is added in include/exclude filters.

BUG: 20923818
Change-Id: I8bf3d43654b69d847e57c94f23aa3799e01948e6
 2015-08-21 10:28:02 +02:00
Chong Zhang
aa1fd4e6d3 Merge "Restore recent task to freeform space when resizing" 2015-08-18 23:55:07 +00:00
Chong Zhang
5dcb275cc1 Restore recent task to freeform space when resizing 
bug: 22984782
Change-Id: I95b7b7b4871865102a279e529f068479e9b5df34
 2015-08-18 15:28:54 -07:00
Wale Ogunwale
339e4155fb Merge "Added support for docked stack" 2015-08-18 21:23:46 +00:00
Wale Ogunwale
b34a7ad1af Added support for docked stack 
Docked stacks occupy a dedicated region on a display.
When a docked stack is present all other static stacks bounds
are restricted to the region of the screen not occupied by
the docked stack.

Change-Id: I6aec3aa19c41a7e756375002f3a925977b5533b5
 2015-08-18 11:31:20 -07:00
Esteban Talavera
019a499c70 am 12e42ba2: am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '12e42ba225cf6c38eaf752f55a22ce6296d2343c':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 16:26:39 +00:00
Esteban Talavera
12e42ba225 am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '31638de30564d5b5fdc4177227cdab6df681ecfc':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:14:04 +00:00
Esteban Talavera
07b36bd3bf am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit 'aed1c9fbc5c4f77bfc8c44fb7bd87bbdb6dc0174':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:00:04 +00:00
Esteban Talavera
5d467ac54a Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 2015-08-17 14:47:49 +00:00
Svetoslav Ganov
99ba7ad73c am f6401419: am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit 'f64014195b6d7bdc2f4d79f3c4c71de16d2fe338':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:44:14 +00:00
Svetoslav Ganov
f64014195b am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '340314fd0306f24fe8e4047b8feede071aadfb97':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:36:40 +00:00
Zoltan Szatmary-Ban
887cffea24 Remove uids with empty history from NetworkStats uid enumeration 
Bug: 23018174
Change-Id: I1a482280599e0f5da18a208e727653d4bd4107ec
 2015-08-14 16:21:52 +01:00
Svetoslav Ganov
7c3d595a3d am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 
* commit '4b655fd193992afff948df513c7b9b9a0389972e':
  Add GTS test to ensure valid default permission grants - framework
 2015-08-14 15:19:47 +00:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Jeff Sharkey
c2f61b7798 am e7ed65eb: am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'e7ed65eb45902123463e7100c261062752587bfd':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:29:06 +00:00
Jeff Sharkey
e7ed65eb45 am 4efd3f26: am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit '4efd3f26ac515f85adde2979ec1d8d68218fc470':
  Method to show DialogFragment allowing state loss.
 2015-08-14 03:19:00 +00:00
Jeff Sharkey
d28991a5e4 am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev 
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
  Method to show DialogFragment allowing state loss.
 2015-08-14 01:35:40 +00:00
Jeff Sharkey
063f850060 Method to show DialogFragment allowing state loss. 
Same as show(), but allowing state loss.

Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
 2015-08-13 16:57:29 -07:00
Alan Viverette
02e8c2d418 Merge "Rebase system theme on configuration change" 2015-08-13 20:06:18 +00:00
Chong Zhang
055f9e1772 Merge "Handle activity launch for background users" 2015-08-13 20:04:19 +00:00
Chong Zhang
45c25ceb3a Handle activity launch for background users 
- When launching activities in background, do not move the
  target stack to front or resume the top activity, it should
  have no observable effect to current user.

- Add the launched background task to recents so that they
  can be found when the background user becomes current.

- Keep track of the last accessed stack for background user,
  so that we know which stack to start with when that user goes
  current

bug: 22929608

Change-Id: I0421a6b490251503df7a7e71465b8aae5138eb2d
 2015-08-13 11:29:51 -07:00
Stefan Kuhne
01da2fc7df Merge "Adding API to access / change the task bounds" 2015-08-13 15:40:08 +00:00
Skuhne
ce2faa5871 Adding API to access / change the task bounds 
Bug: 21738328
Change-Id: I3aabcbe1dcc5caa70f66554157f41fbfacf4c50f
 2015-08-13 08:31:43 -07:00
Svet Ganov
52153f4c05 Add GTS test to ensure valid default permission grants - framework 
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.

bug:23043018

Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
 2015-08-12 21:57:59 -07:00
Todd Kennedy
47c8244e4e Merge "Override package storage constraint" 2015-08-12 16:53:32 +00:00
Alan Viverette
395cd017e6 Rebase system theme on configuration change 
Also makes native theme accesses thread-safe to avoid a race condition
when modifying the theme off the UI thread. Since drawable loading can
occur off the UI thread, we need to ensure Theme access is thread-safe
anyway.

This reverts commit c12ec70def.

Change-Id: If8fecde76d62738a8e55eddf898eafc468afdba2
 2015-08-11 17:27:04 -04:00
Alan Viverette
73a9dfc22c am 4304d9ac: am b2087fa8: am f3d04cbf: am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit '4304d9ac967b73cc79da7a6b7352a74b67afe6f1':
  Don't re-wrap alert dialog context
 2015-08-11 20:08:20 +00:00
Alan Viverette
4304d9ac96 am b2087fa8: am f3d04cbf: am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit 'b2087fa81ccbf4214de31b324ff0106f2363d02d':
  Don't re-wrap alert dialog context
 2015-08-11 20:02:36 +00:00
Alan Viverette
f3d04cbfe6 am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 
* commit 'bb03bf055437c21180026b8c8227c52ca2809286':
  Don't re-wrap alert dialog context
 2015-08-11 19:48:00 +00:00
Alan Viverette
105febd2cf Merge "Don't re-wrap alert dialog context" into mnc-dev 2015-08-11 19:34:27 +00:00
Alan Viverette
93d9e26ffb Don't re-wrap alert dialog context 
Bug: 23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
 2015-08-11 15:02:42 -04:00
Alan Viverette
7bea76cecf am 3e384531: am 1743988c: am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit '3e384531bed8f80867ce1bab9c8de315865be824':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:59:42 +00:00
Alan Viverette
3e384531be am 1743988c: am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit '1743988cd7647af8c64c961d4ca5e9d4b4b7bc00':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:53:13 +00:00
Alan Viverette
6c3a468cf3 am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit 'e720297fd89d39325a34f0d8f54e55971aec7269':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:38:21 +00:00
Alan Viverette
b4eb06402f Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 2015-08-11 18:24:04 +00:00
Alan Viverette
c12ec70def Avoid use-after-free race condition when rebasing theme 
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.

Bug: 22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
 2015-08-11 10:26:08 -04:00
Esteban Talavera
12c49da344 am 6f4de128: am 84bd2172: am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '6f4de12870f02f44ef02efef04dc09affe58d187':
  Update setApplicationRestrictions documentation
 2015-08-11 10:38:58 +00:00
Esteban Talavera
6f4de12870 am 84bd2172: am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '84bd2172ea42dc6681bcf4f96e19a3f5fd928b41':
  Update setApplicationRestrictions documentation
 2015-08-11 10:30:33 +00:00
Esteban Talavera
8e85fdfe46 am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '467951eebbc6525b40a6b569c401849fe2394c1d':
  Update setApplicationRestrictions documentation
 2015-08-11 10:16:36 +00:00
Esteban Talavera
4dbb37ae95 Merge "Update setApplicationRestrictions documentation" into mnc-dev 2015-08-11 09:40:57 +00:00
Filip Gruszczynski
2349332f9f Only relaunch activity on significant size configuration changes. 
Currently if the configuration width/height/smallest width changes, we
relaunch the activity or invoke onConfigurationChanged callback. When it
comes to size based configuration changes it might not be necessary: if
the size change doesn't pass one of the threshold defined by the
resources, it means there is no need to relaunch the activity.

In this CL the ActivityManager will receive the thresholds from the
application and use them to decide, whether to relaunch the activity.
The application reads the thresholds from the resources, specifically
from resource qualifiers used by the app.

Change-Id: Ie3cf0a172dc1ba0b865cf30c2962e7cfd9ad8436
 2015-08-10 13:47:31 -07:00
Esteban Talavera
6b8e06495b Update setApplicationRestrictions documentation 
From M we support nested Bundles in the input parameter

Bug: 23076454
Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
 2015-08-10 18:04:10 +01:00
Todd Kennedy
f39ca8f5e5 Override package storage constraint 
We want to be able to move arbitrary packages to external storage,
regardless what they specify in their manifest. This is a developer
option and should be used with care. Trouble may ensue if an
application is moved when it really doesn't want to be moved

Bug: 22282121
Change-Id: I7664816a7fd122e6cdf3070fe50ce5464f325380
 2015-08-10 09:50:48 -07:00
Dianne Hackborn
908109c1f9 am 0385e3e9: am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit '0385e3e908fb9988bb2d2d0d15e32cb6a819b34e':
  Fix issue #22989030: Separate battery whitelists
 2015-08-08 02:49:41 +00:00