Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209,719 Commits 3 Branches 0 Tags
a487f0cbe22f35959fa2ff3e7cb97bf9e221e538
Commit Graph

6337 Commits

Author SHA1 Message Date
Daniel Sandler
8515917246 am 202dd44a: am 5ea22216: am 82935916: am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit '202dd44a90439eb823566b718c5a8fb159d73a73':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 04:05:19 +00:00
Daniel Sandler
202dd44a90 am 5ea22216: am 82935916: am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit '5ea22216dda8cd13f68f4dc8f405c9809d6c9e37':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:52:22 +00:00
Daniel Sandler
bbe1682b16 Merge changes from topic 'fix-media-notifications' into mnc-dev 
* changes:
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 02:57:06 +00:00
Billy Lau
a91dccdf57 am bafb5130: am ee2ee0f9: am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 
* commit 'bafb51305731fd837b12878fffabe8885239ea10':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
 2015-07-29 23:51:47 +00:00
Billy Lau
bafb513057 am ee2ee0f9: am be6bfb4c: am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 
* commit 'ee2ee0f92d6b18c9e09b32d6ceba9fe22db0565d':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
 2015-07-29 23:36:20 +00:00
Billy Lau
6ad2d66072 Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check 
changes)

AppOpsManager:
Changed the default operating mode for WRITE_SETTINGS to MODE_DEFAULT from
MODE_ALLOWED.

packages/SettingsProvider:
We no longer do static permission checks for WRITE_SETTINGS in early checks and
defer that to app op when MODE_DEFAULT is returned. For some operations,
checking against WRITE_SECURE_SETTINGS is sufficient.

ActivityManagerService & PowerManagerService:
Incorporated app op checks and handled the MODE_DEFAULT case.

provider/Settings:
Added helper function to do checks on whether app ops protected operations
can be performed by a caller. This includes checks for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW.
Also added a public API (with javadocs) for apps to query if they can modify
system settings.
Changed the javadocs description for ACTION_MANAGE_WRITE_SETTINGS and
ACTION_MANAGE_OVERLAY_PERMISSION.
Added public API (with javadocs) for apps to query whether they can draw overlays or not,
and also javadocs description on how to use that check.

Change-Id: I7b651fe8af836c2074defdbd6acfec3f32acdbe9
 2015-07-29 23:21:26 +01:00
Jeff Sharkey
dea786bf7c am fb4a3a99: am aa6c2002: am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'fb4a3a99da3b28e1873feecb5c074aa537239dd6':
  Always return content Uri for downloads.
 2015-07-29 22:04:49 +00:00
Svetoslav Ganov
fdf59bf82f am c875ad14: am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit 'c875ad14ddc09d0d3a3bde58f71845123110f9f2':
  Remove dependencies on the package installer's package name
 2015-07-29 22:03:19 +00:00
Jeff Sharkey
fb4a3a99da am aa6c2002: am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'aa6c200281e35a1d8b566c307c8b1620916c4391':
  Always return content Uri for downloads.
 2015-07-29 20:54:53 +00:00
Jeff Sharkey
b86048dab3 Merge "Always return content Uri for downloads." into mnc-dev 2015-07-29 19:59:36 +00:00
Svetoslav Ganov
c875ad14dd am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit '56de616725aca7d875fafc2a94e00ae9874fedf9':
  Remove dependencies on the package installer's package name
 2015-07-29 19:23:52 +00:00
Dianne Hackborn
fc15b56bd2 am b003d9a8: am c4ed81af: am cb98228d: am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'b003d9a8032a672dbcb76a9750522953d1c0db5d':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 18:42:48 +00:00
Nicolas Prévot
523d865d9f am 327046d0: am e1d51934: am 95c26295: am 2b0cd2c7: am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev 
* commit '327046d0e75c8917dc18cbc23b4aa72b1ba61034':
  Send a public broadcast when the device owner is set.
 2015-07-29 18:42:41 +00:00
Dianne Hackborn
b003d9a803 am c4ed81af: am cb98228d: am deb28b77: am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 
* commit 'c4ed81af8a12fac07c797870207e07cf7dc982c7':
  Work on issue #22765972: Binder transactions running out of address...
 2015-07-29 18:20:56 +00:00
Nicolas Prévot
327046d0e7 am e1d51934: am 95c26295: am 2b0cd2c7: am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev 
* commit 'e1d51934edf4a8605195f38bc24dac0472767545':
  Send a public broadcast when the device owner is set.
 2015-07-29 18:20:49 +00:00
Dan Sandler
912282e731 Fully support Icons in Notification actions. 
RemoteViews now allows Icons as TextView compound
drawables in RemoteViews, but not yet as public API.

Bug: 22600607
Change-Id: I986a0ce3bede09746f0b121884184679f39a79f5
 2015-07-29 14:18:38 -04:00
Svetoslav Ganov
9352af2a9e Merge "Remove dependencies on the package installer's package name" into mnc-dev 2015-07-29 17:54:23 +00:00
Dan Sandler
68079d54f3 Fix media notification action icons. 
In addition to cleaning up some bare references to the icon
slot, we now apply updates to notification RemoteViews in
the context of the supplying app's package. This ensures we
can find the drawables inside any Icon objects that were
constructed without a proper package name, such as is the
case with Actions (because the builder and constructor are
Context-free and so don't know the package name).

This CL also makes clear what was previously only implied:
Non-resource action icons are not actually supported yet
since they can't be pushed to TextView compound drawables
using today's RemoteViews APIs. That will require an API
change.

Bug: 22600607
Change-Id: Ie6b88aed36e4db05be35f843ea3bc1898d4a5c96
 2015-07-29 13:50:32 -04:00
Jeff Sharkey
b11683ba62 Always return content Uri for downloads. 
Now that we're relying more heavily on Uri permission grants between
apps, we should always return content:// Uris.

Bug: 22820206
Change-Id: Ie9603da09944dc594ea5dde2db04455f57d6f103
 2015-07-29 10:22:30 -07:00
Dianne Hackborn
eda1cc50ce Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 2015-07-29 17:05:58 +00:00
Nicolas Prévot
64ac302f0c Merge "Send a public broadcast when the device owner is set." into mnc-dev 2015-07-29 16:59:46 +00:00
Svet Ganov
f1b7f20bb8 Remove dependencies on the package installer's package name 
bug:22700053

Change-Id: I8540eb8577fbec84e1a67e31e1c31ba654c828a4
 2015-07-29 08:33:46 -07:00
Dianne Hackborn
86cbc2bf30 Work on issue #22765972: Binder transactions running out of address... 
...space causing package manager to fail

Lower the maximum IPC size we use in various places, to keep it
under the threshold of becoming dangerous.  Now everything tries
to keep not much more than 64k.

Change-Id: I814013097966a7843179e5d581bfdb254c5ae318
 2015-07-28 18:13:21 -07:00
Dianne Hackborn
6105a30d9d am 0091e2c0: am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '0091e2c03d1f2d212c94a3096e86407c78df6820':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:26:50 +00:00
Dianne Hackborn
0091e2c03d am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '639fd0e9d8ecb59f8d15b3f1e5ec7a6ae6cc3161':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:03:15 +00:00
Nicolas Prevot
0079900883 Send a public broadcast when the device owner is set. 
Make it a protected broadcast.

BUG: 22623518
Change-Id: Ia36e8f0b80a6301d7d8e0461476842c78762b5e8
 2015-07-28 21:11:27 +01:00
Dianne Hackborn
57dd737443 Work on issue #21516866: Implement voice interaction in ResolverActivity 
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
 2015-07-28 12:52:11 -07:00
Chris Wren
87a28758c1 am a3a53c6b: am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit 'a3a53c6b409ada4aba84ffe25c2d6e891ec47a37':
  add ticker to enqueue message for easier debugging
 2015-07-27 14:15:25 +00:00
Chris Wren
a3a53c6b40 am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '447009e3b014e8e9cc591c448064493ca22352f9':
  add ticker to enqueue message for easier debugging
 2015-07-27 14:02:22 +00:00
Chris Wren
45a0bb18fe Merge "add ticker to enqueue message for easier debugging" into mnc-dev 2015-07-27 13:09:15 +00:00
Tor Norbye
585307a36c Merge "Annotate Intent and ContentResolver params with @RequiresPermission" 2015-07-24 18:23:01 +00:00
Svetoslav Ganov
9bec9660a3 am 7ddfc7b0: am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 
* commit '7ddfc7b0245d600605efc4d764378f40d6861437':
  Shut down UiAutomationConnection without a lock held
 2015-07-24 05:15:29 +00:00
Dianne Hackborn
e8a70aa403 am 556aa7dc: am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit '556aa7dc8c1fde7c053ef1c7cac830449eaee0d7':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-24 05:12:44 +00:00
Svetoslav Ganov
7ddfc7b024 am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 
* commit '1c37dc8197ca0f85ae32304930ec254d0ba9911e':
  Shut down UiAutomationConnection without a lock held
 2015-07-24 04:05:56 +00:00
Dianne Hackborn
556aa7dc8c am 00e9e97f: am 47fefc5c: am a45fc6e2: am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 
* commit '00e9e97f7077f1812077a780c1f4fd5d3fa9f288':
  Fix issue #22653116: Google App crashing on NYT app
 2015-07-24 04:03:31 +00:00
Tor Norbye
788fc2b904 Annotate Intent and ContentResolver params with @RequiresPermission 
Change-Id: I831cd55da9c840be0f39b77a8ae868146f089326
 2015-07-23 22:40:55 +00:00
George Mount
b8eb74989e am d2546854: am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit 'd254685497e95ba0f921ed3a4e69636008c7e129':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 22:06:38 +00:00
George Mount
d254685497 am 44543451: am c2c3eacb: am 27fbd360: am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '44543451206a107934c9c74ed5a53d43d73070e8':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-23 21:48:55 +00:00
Svetoslav Ganov
258e630a6b Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 2015-07-23 21:44:58 +00:00
Svet Ganov
7bb48725de Shut down UiAutomationConnection without a lock held 
bug:22599759

Change-Id: I90bca614960522269497127658c16b0bb6ec0476
 2015-07-22 19:03:29 -07:00
Dianne Hackborn
5507bb41b0 Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev 2015-07-23 00:35:34 +00:00
Dianne Hackborn
3e8125b40e Fix issue #22653116: Google App crashing on NYT app 
We weren't correctly handling the root view of the window --
we were just pushing it on to the stack, but that means it got
written at the end.  Instead, we now immediately write it
after the window and let things follow from there.

Change-Id: I070c96bd2443f312a7c6f495d1bf72fa19c614d6
 2015-07-22 17:02:10 -07:00
George Mount
7c482463cb Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 2015-07-21 22:51:27 +00:00
George Mount
13d7032d59 Null checks to prevent NPEs in Fragments transactions. 
Bug 22631964

Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
 2015-07-21 14:30:24 -07:00
Qiwen Zhao
06e260b8db Merge commit '01fda527' 
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
 2015-07-20 15:52:23 -07:00
Ricardo Garcia
ed013b6c9b am 3f655b83: am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit '3f655b83d3a02779aeaa5e9e7921338889f60ce5':
  Fix for MidiManager bug
 2015-07-20 20:55:19 +00:00
Billy Lau
973bd8850a am 1ab5d397: am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 
* commit '1ab5d39764f2b8ab238bcb1b570b788e86c8067b':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
 2015-07-20 20:55:11 +00:00
Dianne Hackborn
01fda52778 am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 
* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...
 2015-07-20 20:42:32 +00:00
Ricardo Garcia
3f655b83d3 am c42940c9: am f2fd5002: am 238f03c9: am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev 
* commit 'c42940c96a4419528310f6dfc23444de385b4cb2':
  Fix for MidiManager bug
 2015-07-20 20:42:12 +00:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00