OSDN Git Service
Dan Albert [Thu, 5 Nov 2015 19:32:43 +0000 (19:32 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
Chad Brubaker [Thu, 5 Nov 2015 18:46:24 +0000 (18:46 +0000)]
Merge "Add initial network security config implementation"
Brian Carlstrom [Thu, 5 Nov 2015 18:38:56 +0000 (18:38 +0000)]
Merge "Fixes for sm and pm usage"
Brian Carlstrom [Thu, 5 Nov 2015 18:33:40 +0000 (10:33 -0800)]
Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"
Bug:
20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
Dan Albert [Thu, 5 Nov 2015 18:18:45 +0000 (18:18 +0000)]
Merge "Don't apply clang flag to gcc builds."
Dan Albert [Thu, 5 Nov 2015 08:59:09 +0000 (00:59 -0800)]
Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).
Bug: http://b/
22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
Dan Albert [Thu, 5 Nov 2015 08:57:12 +0000 (00:57 -0800)]
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/
22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:12 +0000 (02:19 +0000)]
Merge "Take into account default app for default grants"
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:00 +0000 (02:19 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
Svetoslav [Tue, 3 Nov 2015 02:40:18 +0000 (18:40 -0800)]
Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
Chad Brubaker [Fri, 23 Oct 2015 22:33:56 +0000 (15:33 -0700)]
Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.
This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
certificate pinning.
* Policy on what to do with cleartext traffic.
In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.
This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.
Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
Glenn Kasten [Wed, 4 Nov 2015 16:03:41 +0000 (16:03 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
Alejandro Ochoa [Sat, 31 Oct 2015 02:05:00 +0000 (20:05 -0600)]
Built-in mic is not used when USB mic is disconnected
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).
Bug:
24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
Wale Ogunwale [Tue, 3 Nov 2015 15:13:24 +0000 (15:13 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
am:
7810aed854
* commit '
7810aed85408bddc4cc0c65e5be8d082c638d995':
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Wale Ogunwale [Tue, 3 Nov 2015 15:09:32 +0000 (15:09 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
joanne_chung [Mon, 2 Nov 2015 04:41:34 +0000 (12:41 +0800)]
[ActivityManager] Fix NullPointerException in startNextMatchingActivity.
Symptom:
NullPointerException crash while call startNextMatchingActivity.
Root Cause:
Activity starts with FLAG_DEBUG_LOG_RESOLUTION for debug dump.
If the current Activity is the last object of resolves list,
we can not get the next Activity and aInfo is still null.
Solution:
Check null in debug log dump.
Change-Id: I4c5d14d9acd8d47768b36c95354763841579e050
Svetoslav [Tue, 3 Nov 2015 00:41:53 +0000 (16:41 -0800)]
Take into account default app for default grants
Use the correct API to query activities when granting
default permissions to ensure the preferred apps are
taken into account. This allows OEMs to customize which
app should get default permission grants if there is
more than one resolving to the query intent.
Change-Id: I047f22dfff773a2ba9de1a0144442e372607777c
Glenn Kasten [Mon, 2 Nov 2015 23:06:04 +0000 (23:06 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik"
am:
6079b990f1
* commit '
6079b990f1461011a9dedb47cc65db1ce062e199':
BluetoothMidiDevice: change write type to support JamStik
Glenn Kasten [Mon, 2 Nov 2015 23:04:42 +0000 (23:04 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService"
am:
5831944a6e
* commit '
5831944a6e99eff746e70d6ee9532ec3e3f32918':
BLE-MIDI: change binding for BluetoothMidiService
Glenn Kasten [Mon, 2 Nov 2015 23:03:18 +0000 (23:03 +0000)]
Merge "MidiBluetoothService: add new device to HashMap"
am:
9b07ba4bc3
* commit '
9b07ba4bc33319d6db8de173a24eb13b2d7f0b50':
MidiBluetoothService: add new device to HashMap
Glenn Kasten [Mon, 2 Nov 2015 23:01:49 +0000 (23:01 +0000)]
Merge "MidiManager: fix double BTLE callback"
am:
bbf34d0bd1
* commit '
bbf34d0bd1bc4f85c9af614291925f5da1fa0459':
MidiManager: fix double BTLE callback
Glenn Kasten [Mon, 2 Nov 2015 23:00:15 +0000 (23:00 +0000)]
Merge "MidiService: update listener with current status when registered"
am:
d4e9b9e4ac
* commit '
d4e9b9e4ac4196d37b0a5e59867f5a51018f4087':
MidiService: update listener with current status when registered
Glenn Kasten [Mon, 2 Nov 2015 22:51:29 +0000 (22:51 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik"
Glenn Kasten [Mon, 2 Nov 2015 22:51:18 +0000 (22:51 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService"
Glenn Kasten [Mon, 2 Nov 2015 22:51:12 +0000 (22:51 +0000)]
Merge "MidiBluetoothService: add new device to HashMap"
Glenn Kasten [Mon, 2 Nov 2015 22:51:02 +0000 (22:51 +0000)]
Merge "MidiManager: fix double BTLE callback"
Glenn Kasten [Mon, 2 Nov 2015 22:50:50 +0000 (22:50 +0000)]
Merge "MidiService: update listener with current status when registered"
Phil Burk [Tue, 22 Sep 2015 19:07:31 +0000 (12:07 -0700)]
BluetoothMidiDevice: change write type to support JamStik
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.
Bug:
24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
Phil Burk [Thu, 3 Sep 2015 21:37:03 +0000 (14:37 -0700)]
BLE-MIDI: change binding for BluetoothMidiService
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.
Bug:
23219556
Bug:
23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
Phil Burk [Fri, 21 Aug 2015 22:39:10 +0000 (15:39 -0700)]
MidiBluetoothService: add new device to HashMap
The HashMap is being used but devices never added to the map.
Bug:
23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
e5f722e55c5708c2b48b8c9688c135e451225032)
Phil Burk [Fri, 21 Aug 2015 22:22:35 +0000 (15:22 -0700)]
MidiManager: fix double BTLE callback
Stop openBluetoothDevice() from calling its callback twice.
Bug:
23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
Phil Burk [Thu, 6 Aug 2015 06:32:54 +0000 (23:32 -0700)]
MidiService: update listener with current status when registered
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.
Bug:
22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
b2355940e3e697deeecd1b6511cd5094f9dc553a)
Wale Ogunwale [Tue, 27 Oct 2015 15:19:56 +0000 (15:19 +0000)]
Merge "[ActivityManager] Fix IndexOutOfBoundsException"
am:
a61515720a
* commit '
a61515720ab95f6aa307c1fa4337c5c2078bad26':
[ActivityManager] Fix IndexOutOfBoundsException
Wale Ogunwale [Tue, 27 Oct 2015 15:12:56 +0000 (15:12 +0000)]
Merge "[ActivityManager] Fix IndexOutOfBoundsException"
louis_chang [Tue, 27 Oct 2015 02:45:53 +0000 (10:45 +0800)]
[ActivityManager] Fix IndexOutOfBoundsException
Symptom:
The stack was deleted during cleanup, so the stack
list size has reduced by one and cause this issue.
IndexOutOfBoundsException: Invalid index 1, size is 1
Change-Id: Ic6722aed98a0ad789b331d00e89cb74bf3b36d4c
Julia Reynolds [Mon, 26 Oct 2015 15:05:34 +0000 (15:05 +0000)]
Merge "SystemUI: Reload the EndNowButton label"
am:
40b52bbe48
* commit '
40b52bbe480436fbdc3bfb8a1a70c6144e71ff8f':
SystemUI: Reload the EndNowButton label
Julia Reynolds [Mon, 26 Oct 2015 14:57:34 +0000 (14:57 +0000)]
Merge "SystemUI: Reload the EndNowButton label"
Johan Redestig [Fri, 23 Oct 2015 16:23:40 +0000 (18:23 +0200)]
SystemUI: Reload the EndNowButton label
Reload the EndNowButton label when configuration
changes.
Change-Id: I042d31f0bb011996aa8219c3c412e7b71987244c
Neil Fuller [Mon, 26 Oct 2015 10:11:23 +0000 (10:11 +0000)]
Merge "Adjust for changes to libcore/Docs.mk"
am:
f5e3398596
* commit '
f5e33985964c3e7acf6b9cd16d94a110e4f9a42d':
Adjust for changes to libcore/Docs.mk
Neil Fuller [Mon, 26 Oct 2015 10:04:30 +0000 (10:04 +0000)]
Merge "Adjust for changes to libcore/Docs.mk"
Kenny Root [Fri, 23 Oct 2015 23:39:24 +0000 (23:39 +0000)]
Merge "Add Workman keyboard layout"
am:
9a65c36022
* commit '
9a65c36022482d7fd4217e537fa434cc79b69f39':
Add Workman keyboard layout
Kenny Root [Fri, 23 Oct 2015 23:32:01 +0000 (23:32 +0000)]
Merge "Add Workman keyboard layout"
Miao Wang [Fri, 23 Oct 2015 17:05:12 +0000 (17:05 +0000)]
Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements."
am:
773756eeed
* commit '
773756eeed21f67fa7f7eabc663df46c789129aa':
[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements.
Miao Wang [Fri, 23 Oct 2015 17:00:31 +0000 (17:00 +0000)]
Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements."
Andreas Gampe [Fri, 23 Oct 2015 04:16:20 +0000 (04:16 +0000)]
Merge "Revert "libs: add libpackagelistparser""
am:
e3da6ba5dd
* commit '
e3da6ba5dd29002789a76dafdc14987c51d92ea5':
Revert "libs: add libpackagelistparser"
Andreas Gampe [Fri, 23 Oct 2015 03:46:40 +0000 (03:46 +0000)]
Merge "Revert "libs: add libpackagelistparser""
Andreas Gampe [Fri, 23 Oct 2015 02:49:29 +0000 (19:49 -0700)]
Revert "libs: add libpackagelistparser"
This reverts commit
dc06bb0752c1bc3e87b04a097b308bca1bc86181.
This should go into system/core.
Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
Daniel Cashman [Thu, 22 Oct 2015 23:12:49 +0000 (23:12 +0000)]
Merge "libs: add libpackagelistparser"
am:
cc7373eafd
* commit '
cc7373eafd0d5be7df8898748a700b47298ebf10':
libs: add libpackagelistparser
Daniel Cashman [Thu, 22 Oct 2015 23:03:51 +0000 (23:03 +0000)]
Merge "libs: add libpackagelistparser"
Tao Bao [Wed, 21 Oct 2015 17:51:53 +0000 (17:51 +0000)]
Merge "Clean up the uncrypted OTA package on bootup."
am:
5d562d4d2f
* commit '
5d562d4d2fe5697468e5b93b183ed8ea42e115a2':
Clean up the uncrypted OTA package on bootup.
Tao Bao [Wed, 21 Oct 2015 17:30:04 +0000 (17:30 +0000)]
Merge "Clean up the uncrypted OTA package on bootup."
Wale Ogunwale [Wed, 21 Oct 2015 16:08:51 +0000 (16:08 +0000)]
Merge "Ensure state transition of paused activity."
am:
c2b9c5388a
* commit '
c2b9c5388a4038ba260e2c36b7b8884cf4097c2e':
Ensure state transition of paused activity.
Wale Ogunwale [Wed, 21 Oct 2015 16:03:23 +0000 (16:03 +0000)]
Merge "Ensure state transition of paused activity."
Neil Fuller [Wed, 7 Oct 2015 09:30:56 +0000 (10:30 +0100)]
Adjust for changes to libcore/Docs.mk
The paths in libcore_to_document are now relative to
the build root, not libcore.
Bug:
22023363
Change-Id: I75c86d6332e5eaedc67dd0d3207491aa91c02a5f
Elliott Hughes [Tue, 20 Oct 2015 20:35:44 +0000 (20:35 +0000)]
Merge "Fix lseek argument order."
am:
12dccb8a24
* commit '
12dccb8a2450152102b32bf4882200f6b08a5a5a':
Fix lseek argument order.
Elliott Hughes [Tue, 20 Oct 2015 20:25:50 +0000 (20:25 +0000)]
Merge "Fix lseek argument order."
Elliott Hughes [Tue, 20 Oct 2015 20:23:18 +0000 (13:23 -0700)]
Fix lseek argument order.
Change-Id: Ibc2f98e4c26d0ac6ac7b4a73775c5213c4df4518
riddle_hsu [Tue, 20 Oct 2015 08:34:05 +0000 (16:34 +0800)]
Ensure state transition of paused activity.
If there are 2 activties launched during screen off.
Both of them will be scheduled to pause immediately.
But if the first one does not complete pause in time,
and the second one is a non-fullscreen activity, the
first one will still be visible and no need to stop.
After the second one complete pause, mPausingActivity
is cleared, then the first one's complete pause is failed
and keep state at pausing. If it calls finish, it cannot
be destroyed because its state is pausing so expect it will
be paused later, but actually is has complete paused.
Sample and video:
https://code.google.com/p/android/issues/detail?id=190955
Solution:
A failed-to-pause activity should still change state to paused
if it is pausing. Then when the first activity calls finish,
it will satisfy the condition in ActivityStack.finishActivityLocked
"r.state != ActivityState.PAUSING" to continue the finish flow.
Change-Id: I2f211ddf5039b332b0c7d01ccd043aa18fe168f7
Mathieu Chartier [Tue, 20 Oct 2015 00:30:52 +0000 (00:30 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space"
am:
59d548e1e5
* commit '
59d548e1e54fa753d3776647b98dc34ea7c27685':
Fix read_mapinfo to recognize free list large object space
Mathieu Chartier [Mon, 19 Oct 2015 22:36:40 +0000 (22:36 +0000)]
Merge "Fix read_mapinfo to recognize free list large object space"
Mathieu Chartier [Mon, 19 Oct 2015 20:48:34 +0000 (13:48 -0700)]
Fix read_mapinfo to recognize free list large object space
Bug:
25081604
Change-Id: Ie277fd964afcdc80b97432cbd611a8136a2059d7
Tao Bao [Mon, 19 Oct 2015 21:48:36 +0000 (14:48 -0700)]
Clean up the uncrypted OTA package on bootup.
An OTA package needs to be uncrypted before rebooting into recovery if
it sits on an encrypted /data partition. Once uncrypt gets started, we
cannot re-run it on the package again. Because the file may have been
fully or particially uncrypted and we may end up with a corrupt file
under recovery. Always clean up the package when the device boots into
the normal system to avoid that.
Bug:
24973532
Change-Id: I91682c103d1f2b603626c4bf8d818bced71e3674
Wale Ogunwale [Fri, 16 Oct 2015 13:54:54 +0000 (13:54 +0000)]
am
75693994: Merge "Disassociate system windows from apps"
* commit '
75693994f60bdec9a10db98ddb8addd2bc3f8bbb':
Disassociate system windows from apps
Wale Ogunwale [Fri, 16 Oct 2015 13:50:35 +0000 (13:50 +0000)]
Merge "Disassociate system windows from apps"
tiger_huang [Tue, 13 Oct 2015 13:38:19 +0000 (21:38 +0800)]
Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.
This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).
This change is related to the following changes:
https://android.googlesource.com/platform/frameworks/base/+/
a5d29971f8f4d463348e9de0f7af7e2e92a377a0
https://android.googlesource.com/platform/frameworks/base/+/
15ed2754a308546a54ab1061b4e365d6fe9b898d
https://android.googlesource.com/platform/frameworks/base/+/
c3672cd3f7e2bd87d6de9dada499de82b62fae84
https://android.googlesource.com/platform/frameworks/base/+/
41725dedc33906aaafee36b2d6523596e2a8a52e
Bug:
https://code.google.com/p/android/issues/detail?id=189710
Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
Brian Carlstrom [Thu, 15 Oct 2015 16:02:57 +0000 (16:02 +0000)]
am
f916524f: Merge "Add support for --user to "pm path" for work profile use"
* commit '
f916524f44c9955e7c747e5319d17c46a61a3c4c':
Add support for --user to "pm path" for work profile use
Brian Carlstrom [Thu, 15 Oct 2015 15:55:45 +0000 (15:55 +0000)]
Merge "Add support for --user to "pm path" for work profile use"
William Roberts [Fri, 24 Jul 2015 17:05:06 +0000 (10:05 -0700)]
libs: add libpackagelistparser
There are 4 components that all implement package parsing, they are:
1. sdcardd
2. libselinux
3. logd
4. runas
Create a library that can be used by all of them, and new ones as needed.
Change-Id: I87a406802f95d8e7bfd8ee85f723f80e9e6b6c0c
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Jeffrey Vander Stoep [Wed, 14 Oct 2015 21:38:41 +0000 (21:38 +0000)]
am
8b626548: Merge "Pass privapp specifier for selinux labeling"
* commit '
8b62654855b105e5ff7628107691309a63effe0c':
Pass privapp specifier for selinux labeling
Jeffrey Vander Stoep [Wed, 14 Oct 2015 21:33:59 +0000 (21:33 +0000)]
Merge "Pass privapp specifier for selinux labeling"
Miao Wang [Tue, 13 Oct 2015 00:24:13 +0000 (17:24 -0700)]
[RenderScript] Add null check for return values of JNI
Get<TYPE>ArrayElements.
Bug:
20760800
Change-Id: I6ba56933a71721da88d31dbf74c48d42a924305a
Adam Lesinski [Mon, 12 Oct 2015 19:34:43 +0000 (19:34 +0000)]
am
fe1934e4: Merge "RRO: idmap: allow flock(2) to block"
* commit '
fe1934e470681ff7ec5b8ec0609ae9fe24bd7282':
RRO: idmap: allow flock(2) to block
Adam Lesinski [Mon, 12 Oct 2015 19:34:37 +0000 (19:34 +0000)]
am
bac309ca: Merge "RRO: idmap: fix sorting of overlays.list"
* commit '
bac309ca8f4ecd1a835aa36f4be2a1fa45577eab':
RRO: idmap: fix sorting of overlays.list
Adam Lesinski [Mon, 12 Oct 2015 19:34:28 +0000 (19:34 +0000)]
am
2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '
2327239d65525d8ba2bdbedd6e59809fef447a12':
Handle 'root' pseudo-package in the appops command
Adam Lesinski [Mon, 12 Oct 2015 19:30:23 +0000 (19:30 +0000)]
Merge "RRO: idmap: allow flock(2) to block"
Adam Lesinski [Mon, 12 Oct 2015 19:29:39 +0000 (19:29 +0000)]
Merge "RRO: idmap: fix sorting of overlays.list"
Adam Lesinski [Mon, 12 Oct 2015 19:29:14 +0000 (19:29 +0000)]
Merge "Handle 'root' pseudo-package in the appops command"
Adam Lesinski [Mon, 12 Oct 2015 18:59:03 +0000 (18:59 +0000)]
am
7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit '
7caa8f14a78d279e0392089dca2f54f27e7f5d15':
Make 'idmap --scan' accept more than one input directory
Adam Lesinski [Mon, 12 Oct 2015 18:53:25 +0000 (18:53 +0000)]
Merge "Make 'idmap --scan' accept more than one input directory"
Jeff Vander Stoep [Mon, 12 Oct 2015 15:28:56 +0000 (08:28 -0700)]
Pass privapp specifier for selinux labeling
Allow privileged apps to run in their own priv_app domain.
Motivation:
Untrusted_app is overprivileged due to the inclusion of privileged
apps like gmscore, play store and finsky. Moving these and other
privileged apps to their own domain reduces the permissions required
by untrusted_app.
A separate priv_app domain also protects priv-apps by further
isolating them from third party apps.
Bug:
22033466
Change-Id: I8e6ae5677c5a978301c453d0aa51ebed4459f5a0
Wale Ogunwale [Mon, 12 Oct 2015 14:44:46 +0000 (14:44 +0000)]
am
1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '
1ca9f4812749a3eff0654e2ea7773e8b3704c1da':
Fix resumeHomeStackTask can't resume home if activity is finishing.
Wale Ogunwale [Mon, 12 Oct 2015 14:39:16 +0000 (14:39 +0000)]
Merge "Fix resumeHomeStackTask can't resume home if activity is finishing."
Mark Lu [Thu, 8 Oct 2015 05:31:01 +0000 (13:31 +0800)]
Fix resumeHomeStackTask can't resume home if activity is finishing.
Not to resume home activity in finishing stage as following case:
When only home task has 2 activities,
(ex: SetupWizard & DeviceOwnerProvisioningActivity),
If SetupWizard crashed during DeviceOwnerProvisioningActivity in
finishing stage,
makes DeviceOwnerProvisioningActivity cannot destroy immediately,
In resumeHomeStackTask, will resume DeviceOwnerProvisioningActivity
(returned by getHomeActivity),
But actually, DeviceOwnerProvisioningActivity cannot be resumed.
Caused ANR when back key since no more running activity can resume.
Change-Id: Icec49e092d2e7bee7f6a2d198913c1c5db7122f2
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:03:14 +0000 (17:03 +0000)]
am
d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation."
* commit '
d59921149bb5948ffbcb9a9e832e9ac1538e05a0':
Fix punctuation and typos in AllocationAdapter's documentation.
Pirama Arumuga Nainar [Fri, 9 Oct 2015 16:57:54 +0000 (16:57 +0000)]
Merge "Fix punctuation and typos in AllocationAdapter's documentation."
Filip Gruszczynski [Thu, 8 Oct 2015 23:54:13 +0000 (23:54 +0000)]
am
21b37a5f: Merge "Make accessing mInputMethodTarget thread-safe"
* commit '
21b37a5fb46f3dcd20bba0c621d8859e1c8dc32e':
Make accessing mInputMethodTarget thread-safe
Filip Gruszczynski [Thu, 8 Oct 2015 23:50:17 +0000 (23:50 +0000)]
Merge "Make accessing mInputMethodTarget thread-safe"
Pirama Arumuga Nainar [Thu, 8 Oct 2015 02:59:48 +0000 (19:59 -0700)]
Fix punctuation and typos in AllocationAdapter's documentation.
Change-Id: I5574ff201b857a29f30ebe8413dbe4128dcff3ae
Tim Murray [Wed, 7 Oct 2015 23:39:16 +0000 (23:39 +0000)]
am
6c271b89: am
f3acc630: am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
6c271b898c080303c24e524022dd6e4552bda5f5':
Ensure SurfaceView requests WM relayout when size changes.
Tim Murray [Wed, 7 Oct 2015 23:32:28 +0000 (23:32 +0000)]
am
f3acc630: am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
f3acc63015cb3093c3bdc11f6dbd1db2f375eeca':
Ensure SurfaceView requests WM relayout when size changes.
Tim Murray [Wed, 7 Oct 2015 23:28:13 +0000 (23:28 +0000)]
am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
0135690688c8285e022a2a8191c8582f2e6ea759':
Ensure SurfaceView requests WM relayout when size changes.
Chien-Yu Chen [Wed, 7 Oct 2015 23:22:24 +0000 (23:22 +0000)]
am
d07d0071: am
02e4400c: am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
d07d007161e2f64e88eba9f78778ab63b3dd6ab9':
MediaActionSound: Fix video stop sound
Tim Murray [Wed, 7 Oct 2015 23:21:14 +0000 (23:21 +0000)]
Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 23:17:39 +0000 (23:17 +0000)]
am
02e4400c: am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
02e4400cc734079bcc275d14a9ae4d16609403c8':
MediaActionSound: Fix video stop sound
Chien-Yu Chen [Wed, 7 Oct 2015 23:11:20 +0000 (23:11 +0000)]
am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
MediaActionSound: Fix video stop sound
Chien-Yu Chen [Wed, 7 Oct 2015 23:03:52 +0000 (23:03 +0000)]
Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 22:17:19 +0000 (15:17 -0700)]
MediaActionSound: Fix video stop sound
Bug:
24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
Yin-Chia Yeh [Wed, 7 Oct 2015 21:54:41 +0000 (21:54 +0000)]
am
527da81f: am
a71bb6b9: am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
527da81f13fa65b924859ae87f6ccce8d3614140':
Camera: fix wrong FULL feature string
Yin-Chia Yeh [Wed, 7 Oct 2015 21:50:17 +0000 (21:50 +0000)]
am
a71bb6b9: am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
a71bb6b986156b8bd32e387afc74b1ff066fd2a7':
Camera: fix wrong FULL feature string
Yin-Chia Yeh [Wed, 7 Oct 2015 21:41:38 +0000 (21:41 +0000)]
am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
9d68833686e04ff5ff910a9d90fe99bc1347aaca':
Camera: fix wrong FULL feature string