OSDN Git Service
Baligh Uddin [Wed, 4 Nov 2015 23:32:37 +0000 (15:32 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I76cc8d18dd82f9af09310685a88843eeb71a991c
Glenn Kasten [Wed, 4 Nov 2015 16:10:44 +0000 (16:10 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected"
am:
ebbdabdb82
* commit '
ebbdabdb826c083769e7d7bc102a59a04c9e0329':
Built-in mic is not used when USB mic is disconnected
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>
Bill Yi [Tue, 3 Nov 2015 22:29:59 +0000 (14:29 -0800)]
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
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)
Lorenzo Colitti [Thu, 29 Oct 2015 08:16:31 +0000 (08:16 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am:
a2cc04736d am:
e4aacaeec9
am:
c52503acf0
* commit '
c52503acf0a5e4140376391f57de539fbe60ea8f':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 08:09:27 +0000 (08:09 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am:
a2cc04736d
am:
e4aacaeec9
* commit '
e4aacaeec950691700d717efa894a7b51bc87fe2':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 08:02:31 +0000 (08:02 +0000)]
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev
am:
a2cc04736d
* commit '
a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
Don't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 07:57:13 +0000 (07:57 +0000)]
Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev
Bryce Lee [Thu, 29 Oct 2015 07:23:06 +0000 (07:23 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am:
4636770f0d
am:
3b6f9f78cf
* commit '
3b6f9f78cf0ea09176250059653d05cf6a5282c4':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bryce Lee [Thu, 29 Oct 2015 07:16:07 +0000 (07:16 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
am:
4636770f0d
* commit '
4636770f0df6e91cd7fbdf01b958fbdda688db7a':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bryce Lee [Thu, 29 Oct 2015 07:10:15 +0000 (07:10 +0000)]
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev
Lorenzo Colitti [Thu, 29 Oct 2015 06:21:54 +0000 (15:21 +0900)]
Don't crash if a DHCP server doesn't send the server ID option.
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.
Bug:
25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
Bryce Lee [Thu, 29 Oct 2015 05:21:54 +0000 (22:21 -0700)]
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
Bug:
25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
Bryce Lee [Thu, 29 Oct 2015 05:19:19 +0000 (05:19 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am:
0a80294c81
am:
2adf45bee0
* commit '
2adf45bee0b423fa6ca758b806a16b968c0a3c65':
Revert "Declare new interface for headset client bluetooth profile to query."
Bryce Lee [Thu, 29 Oct 2015 05:10:41 +0000 (05:10 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
am:
0a80294c81
* commit '
0a80294c81d86a8bcdc6545b6e31929645cab306':
Revert "Declare new interface for headset client bluetooth profile to query."
Bryce Lee [Thu, 29 Oct 2015 05:04:06 +0000 (05:04 +0000)]
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:58:38 +0000 (04:58 +0000)]
Revert "Declare new interface for headset client bluetooth profile to query."
This reverts commit
694251eaaa8ea70a9b0427d55e9ede437c83a6d5.
Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
Bryce Lee [Thu, 29 Oct 2015 04:53:01 +0000 (04:53 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am:
a841973dee
am:
8b4f21b108
* commit '
8b4f21b108828c08833767c1f3f908e1cd7f8477':
Declare new interface for headset client bluetooth profile to query.
Bryce Lee [Thu, 29 Oct 2015 04:45:09 +0000 (04:45 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
am:
a841973dee
* commit '
a841973deea9281bbb21035055918c0b0cb3230f':
Declare new interface for headset client bluetooth profile to query.
Bryce Lee [Thu, 29 Oct 2015 04:39:08 +0000 (04:39 +0000)]
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev
Bryce Lee [Thu, 29 Oct 2015 04:06:27 +0000 (21:06 -0700)]
Declare new interface for headset client bluetooth profile to query.
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.
Bug:
25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
Svetoslav Ganov [Thu, 29 Oct 2015 01:33:09 +0000 (01:33 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am:
2658cb002a am:
35151fbc8b
am:
08d013d3a1
* commit '
08d013d3a1e6306533c2fae1a4581986ffc9a642':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:24:38 +0000 (01:24 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am:
2658cb002a
am:
35151fbc8b
* commit '
35151fbc8b028f6633f477fd36044032a03b2bff':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:16:46 +0000 (01:16 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
am:
2658cb002a
* commit '
2658cb002abae9341c9a82bfeaed764ba5bf97c8':
Make SYSTEM_ALERT_WINDOW development permission
Svetoslav Ganov [Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
Anthony Hugh [Wed, 28 Oct 2015 18:38:32 +0000 (18:38 +0000)]
Merge "Update permission label strings" into cw-e-dev am:
b69cab65d1
am:
41579ff8fc
* commit '
41579ff8fc06ad655e158b1ab825624437489c83':
Update permission label strings
Anthony Hugh [Wed, 28 Oct 2015 18:29:06 +0000 (18:29 +0000)]
Merge "Update permission label strings" into cw-e-dev
am:
b69cab65d1
* commit '
b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
Update permission label strings
Anthony Hugh [Wed, 28 Oct 2015 18:22:41 +0000 (18:22 +0000)]
Merge "Update permission label strings" into cw-e-dev
Ching Tzung Lin [Wed, 28 Oct 2015 17:41:24 +0000 (17:41 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am:
36da2a208e
am:
c45009906a
* commit '
c45009906ade7b25b6c01c02113c044bd9290ffb':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
Ching Tzung Lin [Wed, 28 Oct 2015 17:33:03 +0000 (17:33 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
am:
36da2a208e
* commit '
36da2a208e253d0635bb569cb92ea0e11f489b4e':
Consolidates config_windowOutsetBottom and circular_display_mask_offset
Ching Tzung Lin [Wed, 28 Oct 2015 17:25:24 +0000 (17:25 +0000)]
Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev
Geoff Mendal [Wed, 28 Oct 2015 15:00:44 +0000 (15:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
c7522c0b1c -s ours am:
d2b3815dda -s ours
am:
9aa91f99b2 -s ours
* commit '
9aa91f99b26ddac01c7045e1a18b6f0116b4eec7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:52:31 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
c7522c0b1c -s ours
am:
d2b3815dda -s ours
* commit '
d2b3815dda57702ebbd00a6422d21a52b0604dfa':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:43:38 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
c7522c0b1c -s ours
* commit '
c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:39:12 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
a4f0ea406d -s ours
am:
4c55431f51 -s ours
* commit '
4c55431f51a3c3c67b3234e4902e7fda5cb81c76':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:38:11 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 28 Oct 2015 14:37:31 +0000 (07:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Oct 2015 14:29:50 +0000 (14:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
a4f0ea406d -s ours
* commit '
a4f0ea406d9c4de166ec65541581666e782b3846':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:26:00 +0000 (14:26 +0000)]
Import translations. DO NOT MERGE am:
b8afc77c0a -s ours am:
7934d4e206 -s ours
am:
32076214a4 -s ours
* commit '
32076214a40a98553a7c634d8d8a8d1eb2efb625':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:22:47 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 28 Oct 2015 14:21:49 +0000 (07:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c1726898d50ea8971a12ddc9fe575615682f95d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Oct 2015 14:18:25 +0000 (14:18 +0000)]
Import translations. DO NOT MERGE am:
b8afc77c0a -s ours
am:
7934d4e206 -s ours
* commit '
7934d4e20603eb2aaa6f6041c932e9ef70b5612f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:11:00 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
b8afc77c0a -s ours
* commit '
b8afc77c0a20a5d4ff7d1afb060c474feeefb1fe':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 13:59:45 +0000 (06:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import
Geoff Mendal [Wed, 28 Oct 2015 12:30:10 +0000 (12:30 +0000)]
Import translations. DO NOT MERGE am:
44036023a5 -s ours
am:
5d79e1b9c1 -s ours
* commit '
5d79e1b9c1129a60663fca69892ebc14270e5d87':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 12:21:45 +0000 (12:21 +0000)]
Import translations. DO NOT MERGE
am:
44036023a5 -s ours
* commit '
44036023a574fa8526c6b436ff5309d5939c94cd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 12:13:26 +0000 (05:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0fba6c467156c09874291320bf9f18d13e4ba466
Auto-generated-cl: translation import
Daniel Sandler [Wed, 28 Oct 2015 03:30:40 +0000 (03:30 +0000)]
Merge "Petites fautes." into mnc-dr-dev am:
da43cc0a21 am:
21858e56d6 -s ours
am:
638003c4fd
* commit '
638003c4fdf959686ba35d19cb99805d3c5f578c':
Petites fautes.
Daniel Sandler [Wed, 28 Oct 2015 03:21:35 +0000 (03:21 +0000)]
Merge "Petites fautes." into mnc-dr-dev am:
da43cc0a21
am:
21858e56d6 -s ours
* commit '
21858e56d640109e36b2f02e244e125adf37020c':
Petites fautes.
Svetoslav [Tue, 27 Oct 2015 22:22:39 +0000 (15:22 -0700)]
Make SYSTEM_ALERT_WINDOW development permission
bug:
25329324
Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
Anthony Hugh [Tue, 27 Oct 2015 21:13:42 +0000 (14:13 -0700)]
Update permission label strings
Updates permission labels to have more consistent
grammar and capitalization.
BUG:
23760467
Change-Id: I61c2f9c72fdf4318e1773f3e0385fb86e0d65f69
Dianne Hackborn [Tue, 27 Oct 2015 20:04:49 +0000 (20:04 +0000)]
Fix issue #
25289999: Lower device idle alarm limit to 10 mins. am:
7682b26ea1 am:
26654c92ca
am:
40bced1d6e
* commit '
40bced1d6ed2dadbd1fff116dad382582c430297':
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
Daniel Sandler [Tue, 27 Oct 2015 20:00:01 +0000 (20:00 +0000)]
Merge "Petites fautes." into mnc-dr-dev
am:
da43cc0a21
* commit '
da43cc0a2150a1c74340b75c919425e2a3f5b6fe':
Petites fautes.
Dianne Hackborn [Tue, 27 Oct 2015 19:55:02 +0000 (19:55 +0000)]
Fix issue #
25289999: Lower device idle alarm limit to 10 mins. am:
7682b26ea1
am:
26654c92ca
* commit '
26654c92caf3d5443e2d7a50fc3573e8d81446d8':
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
Daniel Sandler [Tue, 27 Oct 2015 19:51:31 +0000 (19:51 +0000)]
Merge "Petites fautes." into mnc-dr-dev
Dianne Hackborn [Tue, 27 Oct 2015 19:46:12 +0000 (19:46 +0000)]
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
am:
7682b26ea1
* commit '
7682b26ea164ba1078495e24910f22d73766c192':
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
Dan Sandler [Tue, 27 Oct 2015 17:42:55 +0000 (13:42 -0400)]
Petites fautes.
Bug:
25308153
Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed
Dianne Hackborn [Tue, 27 Oct 2015 00:51:57 +0000 (17:51 -0700)]
Fix issue #
25289999: Lower device idle alarm limit to 10 mins.
This helps with some cases where perisistent network connections
need a more frequent keep alive signal. Actually make it 9
minutes to ensure that things needing a 10 minute cycle will
execute within that time.
Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be
Wale Ogunwale [Tue, 27 Oct 2015 15:27:16 +0000 (15:27 +0000)]
Merge "[ActivityManager] Fix IndexOutOfBoundsException" am:
a61515720a
am:
6c8b91d8c2
* commit '
6c8b91d8c2c657eb8a5b0afa00a3b93044447f56':
[ActivityManager] Fix IndexOutOfBoundsException
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
Geoff Mendal [Mon, 26 Oct 2015 19:52:50 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
337495bded -s ours
am:
515e97a52c -s ours
* commit '
515e97a52c0b15d3e7a2d629d3faa821fa4f285e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:51:18 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
db4f28692a -s ours
am:
ad3bd48dfe -s ours
* commit '
ad3bd48dfe219ac6cb8531f7a7750437c75b0fa3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:49:00 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
9865051825 -s ours
am:
fe4a48c010 -s ours
* commit '
fe4a48c01056f539f041572c5b685fa44eddb9f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:44:27 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
337495bded -s ours
* commit '
337495bded9c4035a922274143c1ab119e692bdd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:42:59 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
db4f28692a -s ours
* commit '
db4f28692aacccb57d64f86b3dfd4205bafebf9b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:40:56 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
9865051825 -s ours
* commit '
9865051825fbc709510deefa129c4210fadf057a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:36:01 +0000 (19:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:35:20 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:35:02 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 26 Oct 2015 19:16:11 +0000 (19:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8961b24ff2 -s ours
am:
7976a3fbf4 -s ours
* commit '
7976a3fbf4581b7b9ef531e8dcd7e6e889d08d76':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:14:46 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
4917e9dd1c -s ours
am:
e8be87e96f -s ours
* commit '
e8be87e96f7c9e854e7ac57475f38fedb8e1cac8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:13:04 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
82b5276866 -s ours
am:
76941becab -s ours
* commit '
76941becab388c347577dfc60d6fae4b190b684a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:08:26 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
8961b24ff2 -s ours
* commit '
8961b24ff2541fc246e275ae3cc4cdda64934462':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:06:53 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
4917e9dd1c -s ours
* commit '
4917e9dd1c727a003e9636e4c78c3f5c1aad7402':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:06:21 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic500efe78e3dd02f8dd74b8c687443bbe559355b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 19:04:39 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
82b5276866 -s ours
* commit '
82b52768667a16a6ef02b2d9aa9cd171f547331a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 19:04:18 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 19:02:09 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 26 Oct 2015 18:59:41 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
OSDN Git Service
