OSDN Git Service
Billy Lau [Thu, 16 Jul 2015 00:20:27 +0000 (00:20 +0000)]
am
008409a2: Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '
008409a2ea1feed095d53ce51429e4fed964c50c':
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW...
Billy Lau [Thu, 16 Jul 2015 00:04:32 +0000 (00:04 +0000)]
Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:39:05 +0000 (23:39 +0000)]
am
f6586cbd: Merge "Implement issue #
22403908: Enable assistant to refuse context sharing" into mnc-dev
* commit '
f6586cbde7d4612963eb2e8a2413235630676b83':
Implement issue #
22403908: Enable assistant to refuse context sharing
Dianne Hackborn [Wed, 15 Jul 2015 23:38:58 +0000 (23:38 +0000)]
am
67e02e60: Merge "Fix issue #
22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
* commit '
67e02e60ca58db95b397fde7bfeeebb012e8aff8':
Fix issue #
22487155: Device unresponsive (deadlock in system_server)
Dianne Hackborn [Wed, 15 Jul 2015 23:38:52 +0000 (23:38 +0000)]
am
c4e2bcd4: Merge "Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
* commit '
c4e2bcd4dca0401ca38a45dce04d29b92231d677':
Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always...
Dianne Hackborn [Wed, 15 Jul 2015 23:38:46 +0000 (23:38 +0000)]
am
c1a49b50: Merge "Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev
* commit '
c1a49b50bf7638484d32ed6dbf863546a47f0e50':
Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with...
Dianne Hackborn [Wed, 15 Jul 2015 23:38:39 +0000 (23:38 +0000)]
am
1cf8b0b6: Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
* commit '
1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
Fix issue #
22124996: VI: Command Request not Active
Billy Lau [Wed, 15 Jul 2015 21:29:19 +0000 (22:29 +0100)]
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
Dianne Hackborn [Wed, 15 Jul 2015 23:31:09 +0000 (23:31 +0000)]
Merge "Implement issue #
22403908: Enable assistant to refuse context sharing" into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:30:49 +0000 (23:30 +0000)]
Merge "Fix issue #
22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:30:16 +0000 (23:30 +0000)]
Merge "Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:30:06 +0000 (23:30 +0000)]
Merge "Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:29:53 +0000 (23:29 +0000)]
Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
Svetoslav [Wed, 15 Jul 2015 23:12:53 +0000 (23:12 +0000)]
am
08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
* commit '
08dda27be4678f2ab5bdc7e210d511ec105c158c':
Make sure we get valid package name or fail.
Christopher Tate [Wed, 15 Jul 2015 23:12:46 +0000 (23:12 +0000)]
am
06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '
06476508c4aae6b9bb5affdc7470abf159ef9eda':
Resolve based on the correct user's default browser
Svetoslav [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]
Merge "Make sure we get valid package name or fail." into mnc-dev
Svetoslav [Wed, 15 Jul 2015 22:58:01 +0000 (15:58 -0700)]
Make sure we get valid package name or fail.
bug:
22492225
Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
Christopher Tate [Wed, 15 Jul 2015 22:57:49 +0000 (22:57 +0000)]
Merge "Resolve based on the correct user's default browser" into mnc-dev
Abodunrinwa Toki [Wed, 15 Jul 2015 22:47:55 +0000 (22:47 +0000)]
am
6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '
6a4014104e85bf4154b353cd0be337f7967cdaeb':
Let the ActionBar handle keyboard shortcuts.
Abodunrinwa Toki [Wed, 15 Jul 2015 22:38:55 +0000 (22:38 +0000)]
Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
Miao Wang [Wed, 15 Jul 2015 22:33:14 +0000 (22:33 +0000)]
am
ad904cf3: Merge "fix BNNM docs" into mnc-dev
* commit '
ad904cf34219897da731eb65f9de53176cc39b20':
fix BNNM docs
Miao Wang [Wed, 15 Jul 2015 22:21:11 +0000 (22:21 +0000)]
Merge "fix BNNM docs" into mnc-dev
Svet Ganov [Wed, 15 Jul 2015 22:12:01 +0000 (22:12 +0000)]
am
75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '
75f6b94a5d5cadb218725011729466e8e438b231':
Grant default permissions to the setup app robustly.
Geoff Mendal [Wed, 15 Jul 2015 22:11:54 +0000 (22:11 +0000)]
am
78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
78b6e6c742a7872ba23c3684c47ff714dbd80cf6':
Import translations. DO NOT MERGE
Adrian Roos [Wed, 15 Jul 2015 22:11:48 +0000 (22:11 +0000)]
am
3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev
* commit '
3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
Show correct locked orientation on phones
Geoff Mendal [Wed, 15 Jul 2015 22:11:42 +0000 (22:11 +0000)]
am
4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:11:35 +0000 (22:11 +0000)]
am
197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
197e7381576bee4b8e2e7195811fe94d1b1b28ec':
Import translations. DO NOT MERGE
Svet Ganov [Wed, 15 Jul 2015 21:58:47 +0000 (21:58 +0000)]
Merge "Grant default permissions to the setup app robustly." into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:56:25 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Adrian Roos [Wed, 15 Jul 2015 21:56:12 +0000 (21:56 +0000)]
Merge "Show correct locked orientation on phones" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:55:49 +0000 (21:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:55:04 +0000 (21:55 +0000)]
am
6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
6e149a2537167f90b1db2430c19ccdf064548b91':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:56 +0000 (21:54 +0000)]
am
a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:49 +0000 (21:54 +0000)]
am
ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ff994bd31b2768eb38efb6c623f0fb6e13d9d61b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:42 +0000 (21:54 +0000)]
am
36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
36c103d685a6ba0f04c52bad2cb666789f5179dc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:35 +0000 (21:54 +0000)]
am
e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e2a0d44c8a837ac44dfc627ef3ca8d5242e78959':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 21:54:06 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Christopher Tate [Wed, 15 Jul 2015 21:52:29 +0000 (14:52 -0700)]
Resolve based on the correct user's default browser
Bug
22509659
Change-Id: Iac75e7b40609bf2c81d266e0568fbfbeb71bb3aa
Geoff Mendal [Wed, 15 Jul 2015 21:50:46 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:48:18 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:47:12 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Svet Ganov [Wed, 15 Jul 2015 18:04:18 +0000 (11:04 -0700)]
Grant default permissions to the setup app robustly.
There is a zoo of components that handle the home intent and
have different priority. There is no reliable way to distinguish
the setup app from the other apps that handle home as some of
them have lower priority than the setup app and some higher.
This change adds a dedicated category to recognize the default
setup app.
Uncommented the code that grants accounts permissions as the
get_accounts permission is now a runtime permission and can be
granted.
bug:
22471024
bug:
22501463
Change-Id: I41726751fa2567cbcd7d09c7acfa7615b8aba577
Geoff Mendal [Wed, 15 Jul 2015 21:44:00 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:41:14 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jorim Jaggi [Wed, 15 Jul 2015 21:24:14 +0000 (21:24 +0000)]
am
eea8be53: Adjust assist disclosure stroke width to spec
* commit '
eea8be533874f279016279cd68618a6592b3dbed':
Adjust assist disclosure stroke width to spec
Dianne Hackborn [Wed, 15 Jul 2015 21:20:51 +0000 (14:20 -0700)]
Implement issue #
22403908: Enable assistant to refuse context sharing
New APIs allow the voice interaction service to set/retrieve a filter
for which of the show flags are allowed.
Change-Id: I588cbe55afee0548ad3afa22d3a7d3bc43cb54a6
Geoff Mendal [Wed, 15 Jul 2015 21:19:57 +0000 (14:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I428e579d5968139dcdf6e8e693f4d2eef182c682
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 21:17:17 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e22afc43c9029b40ba2df53dfc10a9a688c4fd2
Auto-generated-cl: translation import
Jorim Jaggi [Tue, 14 Jul 2015 19:44:12 +0000 (12:44 -0700)]
Adjust assist disclosure stroke width to spec
Bug:
21568059
Change-Id: Ib1ddb8890715b98d36ed5827f053970a9d4a7173
Geoff Mendal [Wed, 15 Jul 2015 21:07:29 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I376fa651ad29df01e4a7844a9e64508f4b163cf0
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 21:02:08 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2960b24e8ab390425898ac33034b24ceae260a65
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:59:16 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a4734ab26f74e593ace500f8ff19d280cf7a6a1
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:56:28 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f6e47dc83c9fea23c61f43f791460d4bc5cc4ca
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:50:55 +0000 (13:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I37b181b340777aed3cb07cfb88c0e69803f4826a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 20:48:05 +0000 (13:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I31dfaa6cbd223dfda3fa841edcb0f62ea576ffb2
Auto-generated-cl: translation import
Roshan Pius [Wed, 15 Jul 2015 19:38:12 +0000 (19:38 +0000)]
am
4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
* commit '
4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
Handle exceptions when accessing Content providers.
Roshan Pius [Wed, 15 Jul 2015 19:23:28 +0000 (19:23 +0000)]
Merge "Handle exceptions when accessing Content providers." into mnc-dev
Felipe Leme [Wed, 15 Jul 2015 19:10:19 +0000 (19:10 +0000)]
am
68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
* commit '
68fd7c798d213bbe304775b13d775ee868abb448':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
Dianne Hackborn [Wed, 15 Jul 2015 19:03:28 +0000 (19:03 +0000)]
am
d193916c: Merge "Fix build." into mnc-dev
* commit '
d193916c83015d54466ad998fb9373f15da754a7':
Fix build.
Jeff Brown [Wed, 15 Jul 2015 19:03:21 +0000 (19:03 +0000)]
am
76c4c666: Add USB port manager.
* commit '
76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 19:03:15 +0000 (19:03 +0000)]
am
2dbccc19: Clean up USB Manager dump.
* commit '
2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
Clean up USB Manager dump.
Felipe Leme [Wed, 15 Jul 2015 19:00:41 +0000 (19:00 +0000)]
Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 18:59:18 +0000 (18:59 +0000)]
Merge "Fix build." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 18:58:27 +0000 (11:58 -0700)]
Fix build.
Change-Id: Ib165c32d1d87e971902b4dd7300ccebd65e71a7d
Miao Wang [Wed, 15 Jul 2015 18:35:28 +0000 (11:35 -0700)]
fix BNNM docs
bug:
22507076
Change-Id: I5fdffdde597d97b1dde77574d096b81bff4aa382
Jeff Brown [Tue, 7 Jul 2015 19:44:17 +0000 (12:44 -0700)]
Add USB port manager.
Add some new internal APIs to enumerate USB Type C ports, query their
status, determine whether they support changing power or data roles,
and doing so. The API also adds a new ACTION_USB_PORT_CHANGED broadcast
for port state changes.
The implementation includes a mechanism for simulating the behavior
of the USB stack. See 'adb shell dumpsys usb -h' for details.
Note that the underlying kernel driver interface is still subject
to change but its behavior has been encapsulated as much as possible.
Bug:
21615151
Change-Id: I0c853ae179248a4550b3e60d02a7a7e65e4546b2
Jeff Brown [Tue, 7 Jul 2015 19:40:53 +0000 (12:40 -0700)]
Clean up USB Manager dump.
Tidy up the dump() implementation in preparation for further work.
Bug:
21615151
Change-Id: If6d94c8dc9457b8e93103541ec1798981eeb5b54
Dianne Hackborn [Wed, 15 Jul 2015 18:32:32 +0000 (11:32 -0700)]
Fix issue #
22487155: Device unresponsive (deadlock in system_server)
Using my magic potion, Deadlock-B-Gone!
Change-Id: If5c0a2b18134dc95444f3782ab5aa475414b5839
Dianne Hackborn [Wed, 15 Jul 2015 18:25:55 +0000 (11:25 -0700)]
Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always...
...returns true
Well it wasn't *quite* always, but close enough. :p
Change-Id: I990b8b2ca7b80ce68a067b0dd92efc1c2faaa8cd
Dianne Hackborn [Wed, 15 Jul 2015 18:21:38 +0000 (11:21 -0700)]
Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with...
..."FATAL EXCEPTION IN SYSTEM PROCESS"
Synchronous calls out of the system process are bad, m'kay?
This should be a safe change because the only place I see calling
this interface are within the system process where there is clearly
no other dependency on ordering.
Change-Id: I483b07cfd68d00d74797784c2a75012e8dd67141
Dianne Hackborn [Wed, 15 Jul 2015 18:18:09 +0000 (11:18 -0700)]
Fix issue #
22124996: VI: Command Request not Active
This stupid thing wasn't even completely implemented
in HandlerCaller! D'oh!
Change-Id: I0dac42c208fa0f08a6e20a6cb17b072f51efcaa7
Jeff Sharkey [Wed, 15 Jul 2015 18:10:53 +0000 (18:10 +0000)]
am
539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev
* commit '
539f7ac7a195c405987057ef34e88cfbe8eab5e8':
Give DCS permission needed to measure all users.
Jeff Sharkey [Wed, 15 Jul 2015 18:10:47 +0000 (18:10 +0000)]
am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
483bd84280ef667e306ec7246d85423ca6b1fde7':
Only send EXTRA_STACK for private intent.
Jeff Sharkey [Wed, 15 Jul 2015 18:02:59 +0000 (18:02 +0000)]
Merge "Give DCS permission needed to measure all users." into mnc-dev
Jeff Sharkey [Wed, 15 Jul 2015 18:02:53 +0000 (18:02 +0000)]
Merge "Only send EXTRA_STACK for private intent." into mnc-dev
Abodunrinwa Toki [Wed, 1 Jul 2015 00:44:04 +0000 (17:44 -0700)]
Let the ActionBar handle keyboard shortcuts.
Bug:
18021345
Change-Id: I5df8711dcd020f172f798745846e7b6c05c69191
Dianne Hackborn [Wed, 15 Jul 2015 17:25:01 +0000 (17:25 +0000)]
am
1d4247c4: Merge "Improve tracking of screen on reasons." into mnc-dev
* commit '
1d4247c4cc89c6d62e44ed3115f26579979b44b5':
Improve tracking of screen on reasons.
Dianne Hackborn [Wed, 15 Jul 2015 17:11:05 +0000 (17:11 +0000)]
Merge "Improve tracking of screen on reasons." into mnc-dev
Dianne Hackborn [Mon, 13 Jul 2015 21:48:08 +0000 (14:48 -0700)]
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
Jeff Sharkey [Wed, 15 Jul 2015 16:58:22 +0000 (09:58 -0700)]
Give DCS permission needed to measure all users.
DCS runs as owner user, but needs to measure details for other users
on the device.
Bug:
22503636
Change-Id: I6d6899fae90c4e92b94647676bda8b88bad412e6
Geoff Mendal [Wed, 15 Jul 2015 16:53:38 +0000 (16:53 +0000)]
am
facfbc52: (-s ours) Import translations. DO NOT MERGE
* commit '
facfbc52d863b11138d7c67087f9b6b0e81765f9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 16:30:20 +0000 (11:30 -0500)]
Import translations. DO NOT MERGE
Change-Id: I54d30125585b48fa3d419a991802ce6152b9cbcd
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 15 Jul 2015 16:13:14 +0000 (09:13 -0700)]
Only send EXTRA_STACK for private intent.
Since it's a private Parcelable class, we can't send it to other
third-party apps, since they won't know how to unpack it.
Bug:
22255387
Change-Id: Ie2ea6cf72b733bd122eb3581a5df295cec608425
Geoff Mendal [Wed, 15 Jul 2015 15:58:00 +0000 (15:58 +0000)]
am
b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b4ac0141b01d98f0d750d9303a670b17e2f76f37':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 15:46:59 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 15:43:54 +0000 (10:43 -0500)]
Import translations. DO NOT MERGE
Change-Id: I03908869f5a297a5400488f13e57999c4e883db0
Auto-generated-cl: translation import
George Mount [Wed, 15 Jul 2015 14:24:35 +0000 (14:24 +0000)]
am
503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '
503ad9ee0d701d045c382cd534865f48f69c024b':
Fix input pause without resume.
George Mount [Wed, 15 Jul 2015 14:12:26 +0000 (14:12 +0000)]
Merge "Fix input pause without resume." into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 13:53:42 +0000 (13:53 +0000)]
am
94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
94666b76988a6a6721a0d5c080f819580da912a2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:53:36 +0000 (13:53 +0000)]
am
57d8be8b: (-s ours) Import translations. DO NOT MERGE
* commit '
57d8be8bc016f088af9ad76e19f72d3bbe4ff325':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 13:48:51 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 13:47:39 +0000 (06:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e7c446cc9fd0a34b81173a74cddc40c22b7b74b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 15 Jul 2015 13:42:54 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic93e9b866c3f933bab929f480a6b8098e585ed9c
Auto-generated-cl: translation import
Adam Powell [Wed, 15 Jul 2015 02:43:15 +0000 (02:43 +0000)]
am
18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '
18709f9a0095afe6dba11f9dd71e3210c5f4e1db':
Relax strict ActionMode instance checking when finishing action modes
Adam Powell [Wed, 15 Jul 2015 02:31:18 +0000 (02:31 +0000)]
Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
Adam Powell [Wed, 15 Jul 2015 02:08:39 +0000 (19:08 -0700)]
Relax strict ActionMode instance checking when finishing action modes
In previous platform versions, finishing an action mode would clean up
the current action mode even if it was not the same ActionMode
instance. Some common shared code inadvertently relied on this
behavior, so stay bug-compatible with it based on targetSdkVersion.
New apps will get the stricter behavior.
Bug
22265882
Change-Id: Id5d6341aefc07a3cb788d5d6d0b531816f761e42
Dianne Hackborn [Wed, 15 Jul 2015 01:57:57 +0000 (01:57 +0000)]
am
63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '
63461e61b9aba2514fb39f87b8741b6db1f7e5d7':
Bump mms whitelist time up to 1 minute.
Dianne Hackborn [Wed, 15 Jul 2015 01:57:51 +0000 (01:57 +0000)]
am
f1f8b9cc: Merge "Fix issue #
21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '
f1f8b9cc3ff5774e695568e8f02b018c0fd02844':
Fix issue #
21626564: MMS should be receivied while Dozing
Dianne Hackborn [Wed, 15 Jul 2015 01:49:52 +0000 (01:49 +0000)]
Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 01:48:07 +0000 (18:48 -0700)]
Bump mms whitelist time up to 1 minute.
Change-Id: I09074c440430580fcfb2581275defe61c63c8ae8