OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours...
Geoff Mendal [Wed, 4 Nov 2015 18:24:14 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7  -s ours am: cbe037b01a  -s ours
am: c5b905f500  -s ours

* commit 'c5b905f50069233c2769352a0614605b3ad348f8':
  Import translations. DO NOT MERGE

8 years agoMerge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googl...
John Reck [Wed, 4 Nov 2015 18:22:58 +0000 (18:22 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: e22d81debd

* commit 'e22d81debd8f2ac9432f42e4c1908da4400a1a29':

8 years agoMerge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b am: f8635c2e04
John Reck [Wed, 4 Nov 2015 18:21:35 +0000 (18:21 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b am: f8635c2e04
am: 26f50df754

* commit '26f50df75477a18e40c6da59a15cc2bd4b441239':
  Revert "Use clang for libhwui"

8 years agoImport translations. DO NOT MERGE am: 4c9cdbc7ba -s ours am: d4d6fdefdf -s ours
Geoff Mendal [Wed, 4 Nov 2015 18:19:40 +0000 (18:19 +0000)]
Import translations. DO NOT MERGE am: 4c9cdbc7ba  -s ours am: d4d6fdefdf  -s ours
am: 7c941cd30c  -s ours

* commit '7c941cd30c9c958c4776126f9f16b343f1f10ff3':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours
Geoff Mendal [Wed, 4 Nov 2015 18:12:19 +0000 (18:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7  -s ours
am: cbe037b01a  -s ours

* commit 'cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
  Import translations. DO NOT MERGE

8 years agoMerge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googles...
John Reck [Wed, 4 Nov 2015 18:11:21 +0000 (18:11 +0000)]
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev

8 years agoMerge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b
John Reck [Wed, 4 Nov 2015 18:10:52 +0000 (18:10 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b
am: f8635c2e04

* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
  Revert "Use clang for libhwui"

8 years agoMerge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b
John Reck [Wed, 4 Nov 2015 18:09:49 +0000 (18:09 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b
am: f8635c2e04

* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
  Revert "Use clang for libhwui"

8 years agoImport translations. DO NOT MERGE am: 4c9cdbc7ba -s ours
Geoff Mendal [Wed, 4 Nov 2015 18:08:13 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE am: 4c9cdbc7ba  -s ours
am: d4d6fdefdf  -s ours

* commit 'd4d6fdefdf83018e46e8de56f0e1679954bb398a':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 4 Nov 2015 18:00:48 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 8e7ab07ce7  -s ours

* commit '8e7ab07ce76c20da653e098adfe38da867753305':
  Import translations. DO NOT MERGE

8 years agoMerge "Revert "Use clang for libhwui"" into mnc-dr-dev
John Reck [Wed, 4 Nov 2015 17:59:15 +0000 (17:59 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev
am: 1e1fbd804b

* commit '1e1fbd804b71419736eac4bf537f0a454687b209':
  Revert "Use clang for libhwui"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 17:57:51 +0000 (17:57 +0000)]
Import translations. DO NOT MERGE
am: 4c9cdbc7ba  -s ours

* commit '4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 4 Nov 2015 17:47:45 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 17:40:21 +0000 (11:40 -0600)]
Import translations. DO NOT MERGE

Change-Id: Icad182fa5b410d93f43fcba49a0d07cefed7970c
Auto-generated-cl: translation import

8 years agoMerge "Revert "Use clang for libhwui"" into mnc-dr-dev
John Reck [Wed, 4 Nov 2015 16:24:02 +0000 (16:24 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev

8 years agoMerge "Built-in mic is not used when USB mic is disconnected" am: ebbdabdb82
Glenn Kasten [Wed, 4 Nov 2015 16:19:36 +0000 (16:19 +0000)]
Merge "Built-in mic is not used when USB mic is disconnected" am: ebbdabdb82
am: 1104180301

* commit '110418030167702f29fa686616d68fc62f9c0995':
  Built-in mic is not used when USB mic is disconnected

8 years agoMerge "Built-in mic is not used when USB mic is disconnected"
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

8 years agoMerge "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"

8 years agoBuilt-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>
8 years agoRevert "Use clang for libhwui"
John Reck [Wed, 4 Nov 2015 15:21:35 +0000 (15:21 +0000)]
Revert "Use clang for libhwui"

Bug 25462107

This reverts commit d354fd2c66855d116440eb4c936317f124241225.

Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:59:32 +0000 (06:59 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4d14bf278e491e46eeaabd4bb97641d06c48920c
Auto-generated-cl: translation import

8 years agoMerge "Remove auto-boxing during the inflate" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:35:39 +0000 (14:35 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev
am: 1c442aca0a

* commit '1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
  Remove auto-boxing during the inflate

8 years agoMerge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:34:19 +0000 (14:34 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
am: 7dda46e740

* commit '7dda46e740250d753bb9d01e129e91695ab8cfe2':
  Update StaticLayout_Delegate to use new nLoadHyphenator

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev am: 931082b728 -s ours
Geoff Mendal [Wed, 4 Nov 2015 14:27:19 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 931082b728  -s ours
am: b67481b336  -s ours

* commit 'b67481b336d211c6d96e2110e865b55f615fd9df':
  Import translations. DO NOT MERGE

8 years agoMerge "Remove auto-boxing during the inflate" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:26:15 +0000 (14:26 +0000)]
Merge "Remove auto-boxing during the inflate" into mnc-ub-dev

8 years agoMerge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
Diego Perez [Wed, 4 Nov 2015 14:25:58 +0000 (14:25 +0000)]
Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev

8 years agoImport translations. DO NOT MERGE am: f44adbba69 -s ours
Geoff Mendal [Wed, 4 Nov 2015 14:25:55 +0000 (14:25 +0000)]
Import translations. DO NOT MERGE am: f44adbba69  -s ours
am: 5bf5deb84c  -s ours

* commit '5bf5deb84cdc61aa27ea12695ee20cc308e45184':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 4 Nov 2015 14:09:51 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: 931082b728  -s ours

* commit '931082b728a42e0b22b163721d7d48faf23d45a4':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 14:08:19 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE
am: f44adbba69  -s ours

* commit 'f44adbba69c22e4c9cd681bbb3cab70097eae118':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 4 Nov 2015 13:38:21 +0000 (13:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 13:20:46 +0000 (07:20 -0600)]
Import translations. DO NOT MERGE

Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Nov 2015 13:09:10 +0000 (05:09 -0800)]
Import translations. DO NOT MERGE

Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import

8 years agoUpdate StaticLayout_Delegate to use new nLoadHyphenator
Diego Perez [Wed, 4 Nov 2015 11:35:34 +0000 (11:35 +0000)]
Update StaticLayout_Delegate to use new nLoadHyphenator

Small fix to update call parameters

Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a

8 years agoActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours am: 6e0a8...
Daniel Koulomzin [Wed, 4 Nov 2015 00:11:13 +0000 (00:11 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc  -s ours am: 6e0a83bcd9
am: d90c2da23c

* commit 'd90c2da23c8ad22819d400d4803ed63c7f856d63':
  ActivityView gets its own thread pool. DO NOT MERGE

8 years agoActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours
Daniel Koulomzin [Wed, 4 Nov 2015 00:02:32 +0000 (00:02 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc  -s ours
am: 6e0a83bcd9

* commit '6e0a83bcd97574451e83d58ac646af9daf3216be':
  ActivityView gets its own thread pool. DO NOT MERGE

8 years agoActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Tue, 3 Nov 2015 23:51:39 +0000 (23:51 +0000)]
ActivityView gets its own thread pool. DO NOT MERGE
am: 7e19e286cc  -s ours

* commit '7e19e286cc990daaafe934ed82ddfa00762907d6':
  ActivityView gets its own thread pool. DO NOT MERGE

8 years agoMerge commit \'bce5116b8d10c91436445cd0a0830bb51702bfd4\' into HEAD
Bill Yi [Tue, 3 Nov 2015 23:33:07 +0000 (23:33 +0000)]
Merge commit \'bce5116b8d10c91436445cd0a0830bb51702bfd4\' into HEAD
am: 2e8c3c11b7

* commit '2e8c3c11b7f482f01b1ff76a6217eaf129253809':

8 years agoMerge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."...
Wale Ogunwale [Tue, 3 Nov 2015 23:29:47 +0000 (23:29 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed854
am: d89b76a58d

* commit 'd89b76a58dcffa7dbc5974d14c7914f44233bef3':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.

8 years agoMerge "BluetoothMidiDevice: change write type to support JamStik" am: 6079b990f1
Glenn Kasten [Tue, 3 Nov 2015 23:28:10 +0000 (23:28 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik" am: 6079b990f1
am: 613c63c742

* commit '613c63c742f1609297156fffe6169ee17db895f4':
  BluetoothMidiDevice: change write type to support JamStik

8 years agoMerge "BLE-MIDI: change binding for BluetoothMidiService" am: 5831944a6e
Glenn Kasten [Tue, 3 Nov 2015 23:26:41 +0000 (23:26 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService" am: 5831944a6e
am: bd32753700

* commit 'bd3275370000d657ea86e3a42f1bd76343b2e6a5':
  BLE-MIDI: change binding for BluetoothMidiService

8 years agoActivityView gets its own thread pool. DO NOT MERGE
Daniel Koulomzin [Thu, 24 Sep 2015 18:38:17 +0000 (14:38 -0400)]
ActivityView gets its own thread pool. DO NOT MERGE

Bug: 24316798

Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052

8 years agoMerge commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4' into HEAD
Bill Yi [Tue, 3 Nov 2015 22:29:59 +0000 (14:29 -0800)]
Merge commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4' into HEAD

8 years agoMerge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev...
Ian Pedowitz [Tue, 3 Nov 2015 22:21:48 +0000 (22:21 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029
am: d6f3e38738

* commit 'd6f3e38738c88821b28b2571d034fc1b189a35de':
  Limit persistent ashmem backed fds to a minimum of 128kB.

8 years agoMerge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev...
Ian Pedowitz [Tue, 3 Nov 2015 22:13:54 +0000 (22:13 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6
am: 95fc53b029

* commit '95fc53b0293a6361c7ff8a412897a869f07664c6':
  Limit persistent ashmem backed fds to a minimum of 128kB.

8 years agoMerge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
Ian Pedowitz [Tue, 3 Nov 2015 22:05:23 +0000 (22:05 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am: 966d6040c6

* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
  Limit persistent ashmem backed fds to a minimum of 128kB.

8 years agoMerge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
Ian Pedowitz [Tue, 3 Nov 2015 21:58:30 +0000 (21:58 +0000)]
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev

8 years agoMerge commit 'd8a8500429' into new
Glenn Kasten [Tue, 3 Nov 2015 20:59:07 +0000 (12:59 -0800)]
Merge commit 'd8a8500429' into new

Change-Id: I13e6c1d3a63e298ddebcc83a229fa497dd5eb129

8 years agoMerge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d am: a66dc6e159
Tenghui Zhu [Tue, 3 Nov 2015 19:55:52 +0000 (19:55 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d am: a66dc6e159
am: a32f221db0

* commit 'a32f221db0361c9047fd61373fbf815c37d958f8':
  Use clang for libhwui

8 years agoMerge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d
Tenghui Zhu [Tue, 3 Nov 2015 19:49:20 +0000 (19:49 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d
am: a66dc6e159

* commit 'a66dc6e159bd8f4997a9253d5590807c02358d84':
  Use clang for libhwui

8 years agoMerge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am:...
Ching Tzung Lin [Tue, 3 Nov 2015 19:43:02 +0000 (19:43 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e81
am: 9c7f6a409b

* commit '9c7f6a409b516328378aa9b882de16c4700c76c4':
  Remove circular_display_mask_offset symbol and default

8 years agoMerge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into...
Dianne Hackborn [Tue, 3 Nov 2015 19:40:43 +0000 (19:40 +0000)]
Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 am: 9a13cc6992
am: a09ac2d998

* commit 'a09ac2d998fdc901fb65b57a061cc445922e081f':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot

8 years agoMerge "Use clang for libhwui" into mnc-dr-dev
Tenghui Zhu [Tue, 3 Nov 2015 19:40:29 +0000 (19:40 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev
am: 61c93eb16d

* commit '61c93eb16d91bd210948af6e812517e3c03535b4':
  Use clang for libhwui

8 years agoMerge "Use clang for libhwui" into mnc-dr-dev
Tenghui Zhu [Tue, 3 Nov 2015 19:25:43 +0000 (19:25 +0000)]
Merge "Use clang for libhwui" into mnc-dr-dev

8 years agoMerge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
Ching Tzung Lin [Tue, 3 Nov 2015 19:03:48 +0000 (19:03 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
am: 7f54aa1e81

* commit '7f54aa1e814527371d54864bcbf9387553822ea7':
  Remove circular_display_mask_offset symbol and default

8 years agoMerge "Remove circular_display_mask_offset symbol and default" into cw-e-dev
Ching Tzung Lin [Tue, 3 Nov 2015 18:39:40 +0000 (18:39 +0000)]
Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev

8 years agoUse clang for libhwui
Chris Craik [Tue, 3 Nov 2015 18:33:34 +0000 (10:33 -0800)]
Use clang for libhwui

bug:25417885

Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156

8 years agoMerge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into...
Dianne Hackborn [Tue, 3 Nov 2015 18:33:57 +0000 (18:33 +0000)]
Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505
am: 9a13cc6992

* commit '9a13cc69926c90fe75b624a9a781dc56706a6091':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot

8 years agoMerge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into...
Dianne Hackborn [Tue, 3 Nov 2015 18:27:18 +0000 (18:27 +0000)]
Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
am: 71e4984505

* commit '71e49845054a3a7dacc51efc4fe658818caec048':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot

8 years agoMerge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into...
Dianne Hackborn [Tue, 3 Nov 2015 18:21:23 +0000 (18:21 +0000)]
Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev

8 years agoLimit persistent ashmem backed fds to a minimum of 128kB.
Riley Andrews [Mon, 2 Nov 2015 07:36:04 +0000 (23:36 -0800)]
Limit persistent ashmem backed fds to a minimum of 128kB.

Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
8 years agoMerge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
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.

8 years agoMerge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."
Wale Ogunwale [Tue, 3 Nov 2015 15:09:32 +0000 (15:09 +0000)]
Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."

8 years agoRemove auto-boxing during the inflate
Diego Perez [Tue, 3 Nov 2015 14:59:23 +0000 (14:59 +0000)]
Remove auto-boxing during the inflate

Change-Id: I3f9ba5d78363f878fa0c58ca8cbf736bd43fe1c0

8 years agoMerge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into...
Thierry Strudel [Tue, 3 Nov 2015 06:51:38 +0000 (06:51 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e am: b1fe11fde4
am: 6efac0595f

* commit '6efac0595f4da7f8009aa5da26a5ca024bbb0e4f':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time

8 years agoMerge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into...
Thierry Strudel [Tue, 3 Nov 2015 06:45:12 +0000 (06:45 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e
am: b1fe11fde4

* commit 'b1fe11fde44b4ac56c48f91cd27ced7ac4b0469f':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time

8 years agoMerge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into...
Thierry Strudel [Tue, 3 Nov 2015 06:39:58 +0000 (06:39 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev
am: 1942be506e

* commit '1942be506eb16589e3059fa62ea7b718440fb386':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time

8 years agoMerge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into...
Thierry Strudel [Tue, 3 Nov 2015 06:35:59 +0000 (06:35 +0000)]
Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev

8 years agoMerge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296 am...
Tyler Gunn [Tue, 3 Nov 2015 04:59:44 +0000 (04:59 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296 am: 48a0c3ae8d
am: e0eaa03307

* commit 'e0eaa03307f2327080becffab3245e33d674a1fe':
  Improve comment on EXTRA_CALL_RAT_TYPE.

8 years agoMerge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296
Tyler Gunn [Tue, 3 Nov 2015 04:54:47 +0000 (04:54 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296
am: 48a0c3ae8d

* commit '48a0c3ae8dd0d3944a3cffa2bafec47f9bc346d6':
  Improve comment on EXTRA_CALL_RAT_TYPE.

8 years agoMerge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
Tyler Gunn [Tue, 3 Nov 2015 04:49:33 +0000 (04:49 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
am: 8b86c76296

* commit '8b86c7629676eeea490531b2a412873e0196eb6f':
  Improve comment on EXTRA_CALL_RAT_TYPE.

8 years agoMerge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev
Tyler Gunn [Tue, 3 Nov 2015 04:44:53 +0000 (04:44 +0000)]
Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev

8 years ago[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

8 years agoMerge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr...
Sanket Padawe [Tue, 3 Nov 2015 02:04:40 +0000 (02:04 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e am: 71f018a411
am: 391c87dea8

* commit '391c87dea8a66a03be07527e1fc15c659e6072d0':
  Fix a crash while printing ICCID because of alphabets in UICC.

8 years agoMerge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr...
Sanket Padawe [Tue, 3 Nov 2015 01:58:05 +0000 (01:58 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e
am: 71f018a411

* commit '71f018a411c55383f395adc52d8363d6103529d3':
  Fix a crash while printing ICCID because of alphabets in UICC.

8 years agoMerge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
Sanket Padawe [Tue, 3 Nov 2015 01:52:13 +0000 (01:52 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
am: b57c65b00e

* commit 'b57c65b00efbcc6c8ed5a64b2c314dbca72d5554':
  Fix a crash while printing ICCID because of alphabets in UICC.

8 years agoMerge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev
Sanket Padawe [Tue, 3 Nov 2015 01:47:04 +0000 (01:47 +0000)]
Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev

8 years agoFixed a bug where the panel could get stuck closing am: b0e4f9e97e am: 157e60f7a2
Selim Cinek [Tue, 3 Nov 2015 01:34:31 +0000 (01:34 +0000)]
Fixed a bug where the panel could get stuck closing am: b0e4f9e97e am: 157e60f7a2
am: 341d544693

* commit '341d544693c47ba9c5a60108e0ed4eabb9e2e069':
  Fixed a bug where the panel could get stuck closing

8 years agoFixed a bug where the panel could get stuck closing am: b0e4f9e97e
Selim Cinek [Tue, 3 Nov 2015 01:29:27 +0000 (01:29 +0000)]
Fixed a bug where the panel could get stuck closing am: b0e4f9e97e
am: 157e60f7a2

* commit '157e60f7a2ec40bdbb3bde0ea41f1c92bef93a1e':
  Fixed a bug where the panel could get stuck closing

8 years agoFixed a bug where the panel could get stuck closing
Selim Cinek [Tue, 3 Nov 2015 01:21:43 +0000 (01:21 +0000)]
Fixed a bug where the panel could get stuck closing
am: b0e4f9e97e

* commit 'b0e4f9e97e272783f08b2245219239aaa667073d':
  Fixed a bug where the panel could get stuck closing

8 years agoFix issue #25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Mon, 2 Nov 2015 21:43:29 +0000 (13:43 -0800)]
Fix issue #25357209: Could not send SMS or MMS messages, had to reboot

I think what probably happened is that since we only report an app
going in to the "interaction" state as an interaction event to usage
stats, apps that sit around in that state forever will only see one
interaction at the start and never again.  So usage stats could start
thinking they are idle.

Fix this by having the activity manager report an interaction event
for such long running applications at least once a day.

Also, because it is correct and for paranoia by protected us another
way, system uids should never go in to standby.

Change-Id: I8a3805bfca86cbe78560488a649ecd07427da99a

8 years agoFix a crash while printing ICCID because of alphabets in UICC.
Sanket Padawe [Mon, 2 Nov 2015 23:45:18 +0000 (15:45 -0800)]
Fix a crash while printing ICCID because of alphabets in UICC.

Bug: 25401769
Change-Id: Ieda058817b8d3cb4b1696fd9932bd0f10da55573

8 years agoMerge "MidiManager: fix double BTLE callback" am: bbf34d0bd1
Glenn Kasten [Mon, 2 Nov 2015 23:10:11 +0000 (23:10 +0000)]
Merge "MidiManager: fix double BTLE callback" am: bbf34d0bd1
am: 58f41c3b76

* commit '58f41c3b76b7b32c430d5dde799aeddc5034d88c':
  MidiManager: fix double BTLE callback

8 years agoMerge "MidiService: update listener with current status when registered" am: d4e9b9e4ac
Glenn Kasten [Mon, 2 Nov 2015 23:08:35 +0000 (23:08 +0000)]
Merge "MidiService: update listener with current status when registered" am: d4e9b9e4ac
am: 350dc16475

* commit '350dc16475c6d64d2837ed19fa736fcdd423f61a':
  MidiService: update listener with current status when registered

8 years agoMerge "BluetoothMidiDevice: change write type to support JamStik"
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

8 years agoMerge "BLE-MIDI: change binding for BluetoothMidiService"
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

8 years agoMerge "MidiBluetoothService: add new device to HashMap"
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

8 years agoMerge "MidiManager: fix double BTLE callback"
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

8 years agoMerge "MidiService: update listener with current status when registered"
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

8 years agoMerge "BluetoothMidiDevice: change write type to support JamStik"
Glenn Kasten [Mon, 2 Nov 2015 22:51:29 +0000 (22:51 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik"

8 years agoMerge "BLE-MIDI: change binding for BluetoothMidiService"
Glenn Kasten [Mon, 2 Nov 2015 22:51:18 +0000 (22:51 +0000)]
Merge "BLE-MIDI: change binding for BluetoothMidiService"

8 years agoMerge "MidiBluetoothService: add new device to HashMap"
Glenn Kasten [Mon, 2 Nov 2015 22:51:12 +0000 (22:51 +0000)]
Merge "MidiBluetoothService: add new device to HashMap"

8 years agoMerge "MidiManager: fix double BTLE callback"
Glenn Kasten [Mon, 2 Nov 2015 22:51:02 +0000 (22:51 +0000)]
Merge "MidiManager: fix double BTLE callback"

8 years agoMerge "MidiService: update listener with current status when registered"
Glenn Kasten [Mon, 2 Nov 2015 22:50:50 +0000 (22:50 +0000)]
Merge "MidiService: update listener with current status when registered"

8 years agoFixed a bug where the panel could get stuck closing
Selim Cinek [Mon, 2 Nov 2015 21:42:58 +0000 (13:42 -0800)]
Fixed a bug where the panel could get stuck closing

When mClosing was set even though the panel was not
expanding, the variable was never reset leading to
bad states like the notification shade not updating,
people missing calls and similar bad bugs.

Bug: 25338991
Change-Id: I4362fda257770c98c5f9ba75a5622b14f74dc5ae

8 years agoRemove circular_display_mask_offset symbol and default
Ching Tzung Lin [Mon, 2 Nov 2015 21:39:51 +0000 (13:39 -0800)]
Remove circular_display_mask_offset symbol and default

Bug:25220421
Change-Id: I05c3bc3c54ee4aaefdfbb4963b8f656663ccee51

8 years agoBluetoothMidiDevice: change write type to support JamStik
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)

8 years agoBLE-MIDI: change binding for BluetoothMidiService
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)

8 years agoMidiBluetoothService: add new device to HashMap
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)

8 years agoMidiManager: fix double BTLE callback
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)

8 years agoMidiService: update listener with current status when registered
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)