Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,369 Commits 3 Branches 0 Tags
f4a4a4c8443c857005aa4c3cb367ffd0cc5f44be
Commit Graph

6129 Commits

Author SHA1 Message Date
Man Cao
80bea9cde1 resolved conflicts for merge of 8fb82074 to master 
Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb
 2015-06-24 17:28:01 -07:00
Mathieu Chartier
8fb8207412 resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp 
Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43
 2015-06-24 15:59:18 -07:00
Chris Wren
bb385a7199 am 4d97dbba: am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit '4d97dbba00d4f792c0236852d209071224e680ba':
  remove setLatestEventInfo
 2015-06-24 22:52:56 +00:00
Chris Wren
4d97dbba00 am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit 'bb9114ff6dcef85f118afa350c33c2c35a68f41d':
  remove setLatestEventInfo
 2015-06-24 22:39:16 +00:00
Adam Lesinski
87344583e1 am 0ebba0e1: am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 
* commit '0ebba0e1a66ddf912b9fb7c43727054cb2d63556':
  Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
 2015-06-24 22:22:02 +00:00
Chris Wren
749d66b82f Merge "remove setLatestEventInfo" into mnc-dev 2015-06-24 22:17:45 +00:00
Adam Lesinski
0ebba0e1a6 am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 
* commit '53d0d0655ca33fbf6a1475a6b97f1a956e5c25f5':
  Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
 2015-06-24 22:11:45 +00:00
Adam Lesinski
c30454c104 Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance() 
Bug:22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
 2015-06-24 13:35:46 -07:00
Man Cao
cfa78b2080 Add an AM option to start with allocation tracking 
The new option "--track-allocation" is to work with the new
allocation tracker in ART.

Bug:20037135
Change-Id: Ic5f8945ab4c1f167c27b05ad0d11d04bac680c1f
 2015-06-24 13:29:29 -07:00
Chris Wren
a05db3816b remove setLatestEventInfo 
This has been deprecated since API 11.

Bug: 18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
 2015-06-24 15:18:34 -04:00
Esteban Talavera
bfd9fd604c am b8abc408: am 833af023: am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev 
* commit 'b8abc408246dc1c5f25aa578015bab652b8b6101':
  Reset permission policy to default when device owner goes away
 2015-06-24 17:12:19 +00:00
Esteban Talavera
b8abc40824 am 833af023: am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev 
* commit '833af023a1ffe0dfa40831c6f71af48e55cc29bb':
  Reset permission policy to default when device owner goes away
 2015-06-24 17:05:23 +00:00
Esteban Talavera
28b9570d02 Reset permission policy to default when device owner goes away 
Otherwise after the Device Owner is gone, runtime
permissions might still be auto granted/denied.
I understand that there are many other policies that
we don't reset after the device/profile owner goes
away (e.g. keyguard enabled/disabled). At least now
we have a single method when we could clear the
ones that we care about.

Bug: 21889278
Change-Id: I6997655e6ef6d474bd25ae1c323eca5b17944b16
 2015-06-24 17:19:19 +01:00
Daniel Sandler
738348d7e0 am 16b3e69f: am af2c0e1b: am 0ec46200: Fix build. 
* commit '16b3e69fd4423b83f984e7955faf1c05f9004c2d':
  Fix build.
 2015-06-24 06:11:49 +00:00
Daniel Sandler
16b3e69fd4 am af2c0e1b: am 0ec46200: Fix build. 
* commit 'af2c0e1b00d33ee0bef572cda267ffe141348ff2':
  Fix build.
 2015-06-24 05:59:13 +00:00
Daniel Sandler
0ec462005d Fix build. 
We don't need purgeResources public since it's part of the
ashmem internal optimization.

Change-Id: I65ba7545cf4801a8b97f3ece9b5ee5100c0f1c97
 2015-06-24 01:27:05 -04:00
Daniel Sandler
5f34ce520b am 46ec5147: am 0e33ef2c: am 25a5f301: Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 
* commit '46ec51475156428355d7510d8994ebbf3ff8aa69':
  Use ashmem backed bitmaps for passing around notifications
 2015-06-24 02:45:00 +00:00
Daniel Sandler
46ec514751 am 0e33ef2c: am 25a5f301: Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 
* commit '0e33ef2c50c886c441e394f6c3ab2b8915f5370a':
  Use ashmem backed bitmaps for passing around notifications
 2015-06-24 02:32:44 +00:00
Daniel Sandler
25a5f30128 Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev 2015-06-24 02:09:58 +00:00
Dianne Hackborn
f81d956aa6 am 16649d96: am 1e7b818d: am fcaed606: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '16649d96cbc65b6e8198f1ab12ef09d7d7ed52e5':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-24 00:12:50 +00:00
Dianne Hackborn
16649d96cb am 1e7b818d: am fcaed606: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '1e7b818d86bed180ed9a5ff08f5cbc8e37f21ba5':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 23:59:38 +00:00
Dianne Hackborn
fcaed60650 Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 23:34:22 +00:00
Amith Yamasani
1d69d48596 am ab8d7e31: am af259ee4: am 862ab87b: Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 
* commit 'ab8d7e31fb1b6526479844111b177be81a54a31c':
  Runtime permissions cannot be set on legacy apps by device policy
 2015-06-23 21:31:05 +00:00
Dianne Hackborn
2d021f8abf am 3eb5480b: am 4401943e: am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '3eb5480b3464e7a29c0940a07cb094d24bc923f7':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 21:30:40 +00:00
Xiaohui Chen
2dcc25070e am 5693debd: am b5148fd6: am a2c159fe: Merge "system_server: optimize app idle parole state change" into mnc-dev 
* commit '5693debd7a4c1a95693d91f932af7d43722d8be5':
  system_server: optimize app idle parole state change
 2015-06-23 21:30:02 +00:00
Amith Yamasani
ab8d7e31fb am af259ee4: am 862ab87b: Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 
* commit 'af259ee4e4db82f5f5b0d0d4ad03c5f3270d3e45':
  Runtime permissions cannot be set on legacy apps by device policy
 2015-06-23 21:06:59 +00:00
Dianne Hackborn
3eb5480b34 am 4401943e: am a6fb1e70: Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 
* commit '4401943e7723e1ba09469df72db1f4e5b0306016':
  Fix issue #20654534: API Review: android.app.assist
 2015-06-23 21:06:39 +00:00
Xiaohui Chen
5693debd7a am b5148fd6: am a2c159fe: Merge "system_server: optimize app idle parole state change" into mnc-dev 
* commit 'b5148fd6099ae0d6a1979dc98a3ff6ac96558b1e':
  system_server: optimize app idle parole state change
 2015-06-23 21:05:44 +00:00
Dianne Hackborn
8ecf16d186 Fix issue #20654534: API Review: android.app.assist 
Remove the old ViewAssistStructure class.

Change-Id: I5eca7bc7af93cda5f654c9094a3aa07fe4958da2
 2015-06-23 13:09:21 -07:00
Jorim Jaggi
a0d58ae574 Use ashmem backed bitmaps for passing around notifications 
Avoids many copies during IPC and duplicate Java heap consumption in
system_server, SystemUI, etc.

Bug: 18386420
Change-Id: Id5ac9406062d472f7848009d65f12131f5f4dac9
 2015-06-23 19:55:41 +00:00
Amith Yamasani
862ab87bda Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 2015-06-23 19:43:41 +00:00
Dianne Hackborn
a6fb1e70ff Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev 2015-06-23 19:33:04 +00:00
Amith Yamasani
0bf8f7cc39 Runtime permissions cannot be set on legacy apps by device policy 
Clarify docs that runtime permissions can be granted or revoked by
a profile owner/device owner only for MNC apps and not legacy apps.

Check the targetSdkVersion and return false if legacy app.

Remove all policy flags from permissions when cleaning up
a device or profile owner.

Bug: 21835304
Bug: 21889278
Change-Id: I4271394737990983449048d112a1830f9d0f2d78
 2015-06-23 12:01:36 -07:00
Xiaohui Chen
a2c159fede Merge "system_server: optimize app idle parole state change" into mnc-dev 2015-06-23 18:23:36 +00:00
Zoltan Szatmary-Ban
4b8de703b5 am d4fafa83: am ddc6d37e: am 2c3c66a2: Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 
* commit 'd4fafa831c23ec2f1fcea8450a843a087ddcf0d6':
  Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
 2015-06-23 10:11:54 +00:00
Zoltan Szatmary-Ban
d4fafa831c am ddc6d37e: am 2c3c66a2: Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 
* commit 'ddc6d37ebe7b60f5755241f343aae7ac522aef40':
  Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN
 2015-06-23 10:00:24 +00:00
Zoltan Szatmary-Ban
2c3c66a2cf Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 2015-06-23 08:44:49 +00:00
Chris Banes
1e0a380513 am 638b2b0a: am fff023e5: am 3ae5e8b2: Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev 
* commit '638b2b0ae249d84e9b95ed023facb854b9590b44':
  Fix leak for MenuInflater + setActionBar
 2015-06-23 07:40:43 +00:00
Chris Banes
638b2b0ae2 am fff023e5: am 3ae5e8b2: Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev 
* commit 'fff023e5d46050e2d9658573c789deed6ad5415b':
  Fix leak for MenuInflater + setActionBar
 2015-06-23 07:29:04 +00:00
Chris Banes
3ae5e8b25b Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev 2015-06-23 07:05:43 +00:00
Rahul Chaturvedi
8ee0c2cf24 Merge "Add binder transaction tracking." 2015-06-22 23:55:09 +00:00
Xiaohui Chen
8dca36dc8a system_server: optimize app idle parole state change 
Currently when app idle parole state changes, all idle apps' states
are updated one by one including firewall modifications which are
very expensive.  This optimization gets rid of individual firewall
rule changes and makes sure we only modify the firewall once at child
chain level.

BUG: 21446713
Change-Id: Iafc415fe0bc127826fe17894d4fedcf1755cb17d
 2015-06-22 15:35:19 -07:00
Dianne Hackborn
16036f2684 Fix issue #20654534: API Review: android.app.assist 
Remove the old classes.

Change-Id: I949350cadc5fc304e2651d7db0ffd38e45db9b6e
 2015-06-22 15:14:17 -07:00
Rahul Chaturvedi
52613f9084 Add binder transaction tracking. 
Add the ability to am to be able to track binder transact calls. This
will help us diagnose excessive IPC calls.

This CL adds the trace-ip command to am. The usage is,

To start binder transaction tracking,
am trace-ipc start
To stop tracking and dump the data to a file,
am trace-ipc stop --dump-file <FILE>

Bug: 21398706
Change-Id: Ic0c9b3be757dd0662a2750a0d8447e2a5ef1fa90
 2015-06-22 16:28:24 -04:00
Julia Reynolds
8ce3cd3562 am 6286a6a8: am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit '6286a6a85bc7a8d959d640191b098c723a427bcd':
  Hide device initializer methods/fields.
 2015-06-22 17:08:12 +00:00
Julia Reynolds
d66559f26d Merge "Hide device initializer methods/fields." into mnc-dev 2015-06-22 16:41:42 +00:00
Chris Banes
601bb9921d Fix leak for MenuInflater + setActionBar 
Caused when there are multiple calls to
setActionBar(). getMenuInflater() will
instantiate and keep an instance to the first
Toolbar (and it's container, etc).

BUG: 21638877
Change-Id: Ic9e45bf8f810a033c31b7484244f14e08a72b9f4
 2015-06-22 10:05:38 +01:00
Amith Yamasani
5f1c2dbcfd am 97d2493f: am b94761d0: Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev 
* commit '97d2493f1a737158f489f4ff9e38e5c19f798bde':
  App Standby : Association between content providers and their sync adapter
 2015-06-19 22:28:24 +00:00
Amith Yamasani
b94761d0a4 Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev 2015-06-19 22:08:13 +00:00
Amith Yamasani
37a40c24de App Standby : Association between content providers and their sync adapter 
Set sync adapters to active if the associated content providers are used
at foreground process state.

Minimize how frequently published content providers are reported by
keeping track of last reported time.

Also cache sync adapters associated with an authority in SyncManager.

Bug: 21785111
Change-Id: Ic2c8cb6a27f005d1a1d0aad21d36b1510160753a
 2015-06-19 15:04:58 -07:00