Commit Graph

6245 Commits

Author SHA1 Message Date
Chris Wren
aaa2335476 am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '45a0bb18fec5b137a540e160cecd4ffd091098d9':
  add ticker to enqueue message for easier debugging
2015-07-27 13:22:29 +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
Svetoslav Ganov
bb8bdd7168 am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '258e630a6bc876c57ac97c6da3e5414d0e7eb036':
  Shut down UiAutomationConnection without a lock held
2015-07-23 22:42:35 +00:00
Svetoslav Ganov
258e630a6b Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 2015-07-23 21:44:58 +00:00
Dianne Hackborn
aa0d93873d am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev
* commit '5507bb41b0cb11fe36573d59dc4ec8ed03cf7715':
  Fix issue #22653116: Google App crashing on NYT app
2015-07-23 18:58:53 +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
246ede1b9c am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '7c482463cbea39cdbf2c3c8f481d82711cf0475b':
  Null checks to prevent NPEs in Fragments transactions.
2015-07-22 20:17:21 +00: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
Dianne Hackborn
86e56bb371 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
2015-07-20 20:04:26 +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
Ricardo Garcia
d199589b7e am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
  Fix for MidiManager bug
2015-07-20 18:45:13 +00:00
Billy Lau
ffdd2e85e4 am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
* commit '072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
2015-07-20 18:04:19 +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
Chris Wren
365b6d3d01 add ticker to enqueue message for easier debugging
Bug: 22462619
Change-Id: Iadb28d251b55c1a1f241c0d0a4fb8e117b8030c0
2015-07-17 14:43:15 +00:00
Selim Cinek
c4d09707e3 am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
* commit 'b43b06d1056031444596edcc27a1a10084e5cad3':
  Fixed a bug where notifications were not posted on secondary users
2015-07-17 01:40:00 +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
45b281298d am 86647987: Icon-related Notifications API changes:
* commit '86647987c3c6bf4e6a8bacd763ff16f1806c70a3':
  Icon-related Notifications API changes:
2015-07-17 01:10:37 +00: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
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
2264842f71 am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
* commit '6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
  Improve documentation of onRequestPermissionsResult
2015-07-17 00:04:53 +00: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
628d4653d4 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
2015-07-16 21:51:14 +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
f1be07928e am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale
2015-07-16 19:26:05 +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
5fb324adfe am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit 'bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
  Make additional shared elements a version-checked feature.
2015-07-16 14:29: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
1db9717a3b am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
2015-07-16 00:20:27 +00:00
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +00:00
Dianne Hackborn
cc8555bf2c am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
* commit 'c4e2bcd4dca0401ca38a45dce04d29b92231d677':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
2015-07-15 23:38:52 +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
5db783810e am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '6a4014104e85bf4154b353cd0be337f7967cdaeb':
  Let the ActionBar handle keyboard shortcuts.
2015-07-15 22:47:55 +00:00
Abodunrinwa Toki
6a4014104e Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 2015-07-15 22:39:21 +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
e632586957 am 1d4247c4: Merge "Improve tracking of screen on reasons." into mnc-dev
* commit '1d4247c4cc89c6d62e44ed3115f26579979b44b5':
  Improve tracking of screen on reasons.
2015-07-15 17:25:01 +00: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