Commit Graph

6233 Commits

Author SHA1 Message Date
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
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled...
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
2015-07-20 12:49:10 -07:00
Billy Lau
1ab5d39764 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 '68a2b6552af226cbc014273bdef6ce353ebf348a':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
2015-07-20 19:26:13 +00:00
Ricardo Garcia
2dcfc7a997 Merge "Fix for MidiManager bug" into mnc-dev 2015-07-20 18:03:45 +00:00
Billy Lau
072e04a7f1 Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 2015-07-20 17:57:30 +00:00
Billy Lau
24b9c8314b Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
2015-07-20 18:36:39 +01:00
Selim Cinek
56c4cef8dc am 3967be02: am b59d3820: am 928b2bf7: am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
* commit '3967be028d4009167b323491de12f8fff890054c':
  Fixed a bug where notifications were not posted on secondary users
2015-07-17 02:24:41 +00:00
Dan Sandler
1663c5e91c am 19d6dae4: am cfaf2d54: am 8f895de9: am 86647987: Icon-related Notifications API changes:
* commit '19d6dae447860c332501f7284e97c2734f7a040e':
  Icon-related Notifications API changes:
2015-07-17 01:54:42 +00:00
Selim Cinek
b43b06d105 Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 2015-07-17 01:31:31 +00:00
Ricardo Garcia
47abda576e Fix for MidiManager bug
Returning null if MidiManager service can't be created instead
of crashing with NPE.

bug: 22087661
Change-Id: Ia27835ea1197af2db04c3e7f1d2e7c9f32fddbd0
2015-07-16 18:20:46 -07:00
Dan Sandler
86647987c3 Icon-related Notifications API changes:
- Deprecate Notification.icon and largeIcon.
    setSmallIcon(Icon) and setLargeIcon(Icon) should be used
    instead.
  - Add Icon support to Notification actions; deprecate
    Action.icon and methods/ctors that use int.

Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
2015-07-17 00:59:20 +00:00
Svet Ganov
b958795675 am 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
* commit '1d75ba1bce3a69cc6b5fa018f64e0ef7e67f3e2f':
  Improve documentation of onRequestPermissionsResult
2015-07-17 00:49:55 +00:00
Selim Cinek
f33b11182a Fixed a bug where notifications were not posted on secondary users
Unfortunately they made sound though, driving people crazy.

Bug: 22351758
Change-Id: I9ec5bac97c2d587c4e356ab759876def3369b11a
2015-07-16 17:24:51 -07:00
Svet Ganov
6f561a24c9 Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 2015-07-16 23:51:53 +00:00
Svet Ganov
0f45c7c7c4 Improve documentation of onRequestPermissionsResult
bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
2015-07-16 16:29:04 -07:00
Dianne Hackborn
ee924dedcc am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev
* commit '587f0c58f506b167667c789c16292c4e405eac1f':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
2015-07-16 22:36:06 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Svet Ganov
a73c88dbb8 am d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit 'd019bce4129b224e638dd4ec235387f85d19e052':
  Return a result from Fragment#shouldShowRequestPermissionRationale
2015-07-16 20:12:01 +00:00
Svet Ganov
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00
Dianne Hackborn
a7cfbe0e54 Work on issue #22516282: ChooserTarget URI grants not forwarded
Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307
2015-07-16 10:52:52 -07:00
Svet Ganov
9e136b88ba Return a result from Fragment#shouldShowRequestPermissionRationale
bug:22523342

Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
2015-07-16 09:58:43 -07:00
George Mount
5ee9088a33 am d3682f6d: am aa476de5: am 2456f77c: am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit 'd3682f6da6550c1a63ab62d5be0bb8622acd05d6':
  Make additional shared elements a version-checked feature.
2015-07-16 15:09:51 +00:00
George Mount
bd87b6b5b0 Merge "Make additional shared elements a version-checked feature." into mnc-dev 2015-07-16 14:24:09 +00:00
George Mount
2c256a04ae Make additional shared elements a version-checked feature.
Bug 22505481

ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.

Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
2015-07-16 07:09:42 -07:00
Billy Lau
1178526c35 am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '0d360d17a4307f32f3179ade4d3730d0a02d227d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
2015-07-16 01:13:18 +00:00
Dianne Hackborn
213a883a3c am 822fd8f1: am 178d35d4: am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
* commit '822fd8f190696f4082537cec51c8a71790bd4885':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
2015-07-16 00:24:29 +00:00
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +00:00
Abodunrinwa Toki
816933989f am 7572e694: am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '7572e6940c1ca2ecf90207baac0046bf7115cfb4':
  Let the ActionBar handle keyboard shortcuts.
2015-07-15 23:38:45 +00:00
Billy Lau
060275ffc7 Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
AppOpsManager:
Changed the default mode for SYSTEM_ALERT_WINDOW to MODE_DEFAULT instead of
MODE_ALLOWED. Otherwise, an app that did not declare for this permission will
actually be allowed to perform OP_SYSTEM_ALERT_WINDOW, which is undesirable.
This change also allows callers to make their own decision based on the
current policy (M vs pre-M apps).

policy/PhoneWindowManager:
Added additional checks that will handle MODE_DEFAULT - this happens when an app
is newly installed but not yet configured.

wm/WindowManagerService:
Enriched some checks to include the treatment of MODE_DEFAULT - this will allow
pre-M apps uninterupted capability to draw on top of other apps.

Change-Id: I8de77730e158c97587427820cfba721bd5607bea
2015-07-16 00:34:26 +01:00
Dianne Hackborn
c4e2bcd4dc Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 2015-07-15 23:30:19 +00:00
Abodunrinwa Toki
6a4014104e Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 2015-07-15 22:39:21 +00:00
Jim Miller
2e56339a4a am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
  Improve tracking of screen on reasons.
2015-07-15 22:26:05 +00:00
Dianne Hackborn
fcbfeaf069 Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
...returns true

Well it wasn't *quite* always, but close enough. :p

Change-Id: I990b8b2ca7b80ce68a067b0dd92efc1c2faaa8cd
2015-07-15 11:25:55 -07:00
Abodunrinwa Toki
a04b7add4b Let the ActionBar handle keyboard shortcuts.
Bug: 18021345
Change-Id: I5df8711dcd020f172f798745846e7b6c05c69191
2015-07-15 10:44:43 -07:00
Dianne Hackborn
1d4247c4cc Merge "Improve tracking of screen on reasons." into mnc-dev 2015-07-15 17:11:12 +00:00
Dianne Hackborn
280a64e793 Improve tracking of screen on reasons.
- New screen on app op to record the last time each app has
  caused the screen to be turned on.
- New battery stats event that tells us the reason the screen
  has been asked to turn on.
- Propagate out power manager API to specify the reason a caller
  is asking to have the screen turned on.

Note that currently the window flag to turn the screen on bypasses
much of this because it is being handled in the window manager by
just directly telling the power manager to turn the screen on.  To
make this better we need a new API where it can specify who it is
calling the API for.

Change-Id: I667e56cb1f80508d054da004db667efbcc22e971
2015-07-15 09:59:07 -07:00
George Mount
de036f5dea am 60ca7690: am b72c1579: am 91202e59: am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '60ca7690bc556abe71869b05304ee469fa9546c5':
  Fix input pause without resume.
2015-07-15 15:07:41 +00:00
George Mount
503ad9ee0d Merge "Fix input pause without resume." into mnc-dev 2015-07-15 14:12:28 +00:00
Dianne Hackborn
808dd5cc8a am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '4753b5bcf4877e125a8e38d5bcd2ac46c1744429':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 02:21:54 +00:00
Fyodor Kupolov
1fa2a08882 am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '1281575c257d52f256f4a08559611e6ec0b6190e':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:42:58 +00:00
Dianne Hackborn
fd854ee58c Fix issue #21626564: MMS should be receivied while Dozing
We now place whoever is receiving the MMS on the temporary
whitelist while doing so, so they can get network access to
download it.

There was also an issue that needed to be fixed where we
were no longer updating the list of allowed uids while
dozing based on their proc states...  we now do that.

Also did a bit of optimization of the temp white list update
path do the network policy manager, instead of going through
a broadcast we now directly call in to the network policy
manager.  This also allows us to have a synchronous version
of updating the list, so we can know the app has network access
before we tell it to do anything.

Finally added battery stats events for things going on and off
the whitelist so we can diagnose the behavior there.

Change-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455
2015-07-14 18:33:08 -07:00
Fyodor Kupolov
d4fd8c766d Added sendBroadcastMultiplePermissions method
Added Context.sendBroadcastMultiplePermissions(Intent intent, String[]
receiverPermissions) method, which allows an array of required permissions
to be enforced.

Bug: 21852542
Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
2015-07-14 17:25:42 -07:00
Fyodor Kupolov
7aeb1a5c19 am cf4617cf: am 1aeceef4: am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit 'cf4617cfd0c9da1fa5a12da5ed576dd0c823f8e5':
  Revert "Allow array of required permissions in sendBroadcast"
2015-07-14 23:55:48 +00:00
Fyodor Kupolov
64e8aa18f8 am 7f006b52: am 70174794: am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit '7f006b52215634f37aa881157df6473b8e3dd803':
  Allow array of required permissions in sendBroadcast
2015-07-14 22:56:11 +00:00
Fyodor Kupolov
4a817924ec Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 2015-07-14 22:43:47 +00:00
Fyodor Kupolov
e37520b49d Revert "Allow array of required permissions in sendBroadcast"
This reverts commit b4e7283c9a.

Change-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664
2015-07-14 22:29:21 +00:00
Jeff Sharkey
026d6f97d1 am de404257: am 556136c8: am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit 'de404257a99d3a94b4d92923248af77817e447ed':
  Better handling of storage paths.
2015-07-14 22:01:16 +00:00
Fyodor Kupolov
d69a82c107 Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 2015-07-14 21:57:34 +00:00