git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Wink Saville [Tue, 9 Sep 2014 00:18:34 +0000 (00:18 +0000)]

am 0dc5409c: am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev

* commit '0dc5409cb5ee5493f305b2f0237369b6b17aabac':
Change getCurrentPhoneType to SystemApi

commit | commitdiff | tree

Amit Mahajan [Tue, 9 Sep 2014 00:18:30 +0000 (00:18 +0000)]

am 9b507f23: am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev

* commit '9b507f23c2eb41ff0587289ce98a8f40394c82a4':
Assisted dialing support of MO SMS

commit | commitdiff | tree

Wink Saville [Tue, 9 Sep 2014 00:05:54 +0000 (00:05 +0000)]

am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev

* commit '26207b53a82f1e8f3d72eaf36bd69dbcb06833fc':
Change getCurrentPhoneType to SystemApi

commit | commitdiff | tree

Amit Mahajan [Tue, 9 Sep 2014 00:05:50 +0000 (00:05 +0000)]

am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev

* commit '034fe21c638960d8d67711f446c818b93e41641e':
Assisted dialing support of MO SMS

commit | commitdiff | tree

Amit Mahajan [Tue, 9 Sep 2014 00:04:31 +0000 (00:04 +0000)]

am 37999f4a: am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev

* commit '37999f4aa06d8111a14882285bc2b28c2b03a23e':
change the property name about IDP from 'telephony.' to 'gsm.'

commit | commitdiff | tree

Chris Craik [Tue, 9 Sep 2014 00:04:27 +0000 (00:04 +0000)]

am 63fe87ff: am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev

* commit '63fe87ffece32b234323322621467b6bbb3b1b6f':
Don't track TextureLayer lifecycles in RenderState

commit | commitdiff | tree

Wink Saville [Tue, 9 Sep 2014 00:00:48 +0000 (00:00 +0000)]

Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev

commit | commitdiff | tree

Amit Mahajan [Mon, 8 Sep 2014 23:56:30 +0000 (23:56 +0000)]

Merge "Assisted dialing support of MO SMS" into lmp-dev

commit | commitdiff | tree

Amit Mahajan [Mon, 8 Sep 2014 23:54:29 +0000 (23:54 +0000)]

am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev

* commit '1fa77bb56b47049ab90fb3b1b81f1588896bc87c':
change the property name about IDP from 'telephony.' to 'gsm.'

commit | commitdiff | tree

Chris Craik [Mon, 8 Sep 2014 23:54:24 +0000 (23:54 +0000)]

am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev

* commit '2d0c82ad0a4055aa28f551b8316899903dd6531e':
Don't track TextureLayer lifecycles in RenderState

commit | commitdiff | tree

Amit Mahajan [Mon, 8 Sep 2014 23:52:35 +0000 (23:52 +0000)]

Merge "change the property name about IDP from 'telephony.' to 'gsm.'" into lmp-dev

commit | commitdiff | tree

Wink Saville [Mon, 8 Sep 2014 23:52:03 +0000 (16:52 -0700)]

Change getCurrentPhoneType to SystemApi

Bug: 17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683

commit | commitdiff | tree

Chris Craik [Mon, 8 Sep 2014 23:47:30 +0000 (23:47 +0000)]

Merge "Don't track TextureLayer lifecycles in RenderState" into lmp-dev

commit | commitdiff | tree

Steven Liu [Mon, 8 Sep 2014 18:33:33 +0000 (13:33 -0500)]

change the property name about IDP from 'telephony.' to 'gsm.'

'telphony.' couldn't be set successfully.

Change-Id: I8a9ee29461bf764f2b269bb81fafe83d8d5e48d9

commit | commitdiff | tree

Chris Craik [Mon, 8 Sep 2014 23:40:21 +0000 (16:40 -0700)]

Don't track TextureLayer lifecycles in RenderState

bug:17208461

They are destroyed via finalizer-enqueued destroy method, so it's not
valid to check that they've been destroyed at gl context destruction
time.

Change-Id: I670f69825547facd5f31d44acb406418881fee00

commit | commitdiff | tree

Sreeram Ramachandran [Mon, 8 Sep 2014 23:42:46 +0000 (23:42 +0000)]

am 61e1d7da: am ccfdd756: Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev

* commit '61e1d7da7b087656a63079d41000f755d03820db':
Reserve NetIds 1..50 for OEM use.

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:42:41 +0000 (23:42 +0000)]

am 5d37962d: am 3b64e8dc: Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev

* commit '5d37962d2abedc8bc5e9b305642cbe962132c383':
Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:42:37 +0000 (23:42 +0000)]

am 36bbc399: am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev

* commit '36bbc3991bff010a9e55a1a117ff03ec84bc40e0':
Add FEATURE_GAMEPAD.

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:31:53 +0000 (23:31 +0000)]

am f07575ae: am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev

* commit 'f07575aeeb840cdc14f1e6b4ff0d1343a30b00b6':
Allow wake keys to wake dozing device.

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:31:48 +0000 (23:31 +0000)]

am 3026f1b7: am 64ae551a: Merge "Remove unused variables from UsbHostManager." into lmp-dev

* commit '3026f1b71089bde3ff0be7254c7b2bb3989088a6':
Remove unused variables from UsbHostManager.

commit | commitdiff | tree

Sreeram Ramachandran [Mon, 8 Sep 2014 23:31:34 +0000 (23:31 +0000)]

am ccfdd756: Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev

* commit 'ccfdd756579a161f0793414da3f2bd94a5f8803d':
Reserve NetIds 1..50 for OEM use.

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:31:30 +0000 (23:31 +0000)]

am 3b64e8dc: Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev

* commit '3b64e8dc62ac880e7ea347ccab15bd18baef7244':
Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:31:25 +0000 (23:31 +0000)]

am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev

* commit 'd49dc106aec6441f0db0c5a181b8ae578a76f927':
Add FEATURE_GAMEPAD.

commit | commitdiff | tree

Sreeram Ramachandran [Mon, 8 Sep 2014 23:28:47 +0000 (23:28 +0000)]

Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev

commit | commitdiff | tree

Ihab Awad [Mon, 8 Sep 2014 23:23:19 +0000 (23:23 +0000)]

am 6d92c31d: am c69b2a66: Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev

* commit '6d92c31da3765a7972ab29d3785c9726a4658693':
Enable (@hidden) video connection support for RemoteConnections

commit | commitdiff | tree

Robert Ly [Mon, 8 Sep 2014 23:23:14 +0000 (23:23 +0000)]

am 5ef20e85: am 8414b3b9: am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

* commit '5ef20e85f4c6878d507fd4c1a89e3efb80446ef6':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:22:27 +0000 (23:22 +0000)]

Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:21:48 +0000 (23:21 +0000)]

Merge "Add FEATURE_GAMEPAD." into lmp-dev

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:21:13 +0000 (23:21 +0000)]

am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev

* commit '56d11c6e833a6c10dd462203545968ed293bb323':
Allow wake keys to wake dozing device.

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:21:08 +0000 (23:21 +0000)]

am 64ae551a: Merge "Remove unused variables from UsbHostManager." into lmp-dev

* commit '64ae551a4f26b3868c66baa362c464e109a0da44':
Remove unused variables from UsbHostManager.

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:14:08 +0000 (23:14 +0000)]

Merge "Allow wake keys to wake dozing device." into lmp-dev

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 23:13:42 +0000 (23:13 +0000)]

Merge "Remove unused variables from UsbHostManager." into lmp-dev

commit | commitdiff | tree

Ihab Awad [Mon, 8 Sep 2014 23:09:23 +0000 (23:09 +0000)]

am c69b2a66: Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev

* commit 'c69b2a66fed1b8fd1ed511d2c776fcd4e2cbd54d':
Enable (@hidden) video connection support for RemoteConnections

commit | commitdiff | tree

Robert Ly [Mon, 8 Sep 2014 23:09:19 +0000 (23:09 +0000)]

am 8414b3b9: am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

* commit '8414b3b963562d429bf8f2d1ba21d383f7d2339f':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 23:09:03 +0000 (23:09 +0000)]

am cb39e887: am 8fd9c6eb: am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

* commit 'cb39e8873103bf6c8c268f75357c6b59f364774e':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 23:08:58 +0000 (23:08 +0000)]

am 24214d37: am a24ba624: am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

* commit '24214d378198c1d5cc486f8c8d4e3188fee126c4':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

commit | commitdiff | tree

RoboErik [Mon, 8 Sep 2014 23:08:53 +0000 (23:08 +0000)]

am c1ec88a5: am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev

* commit 'c1ec88a508ac65f27c83ecf3fd4ab9bb4c19a8b1':
Possible fix for dead handler in Music button event sending

commit | commitdiff | tree

Michael Wright [Sat, 6 Sep 2014 00:57:44 +0000 (17:57 -0700)]

Add FEATURE_GAMEPAD.

This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.

Change-Id: Ie5e2cf69f777ebe84abb83f34c9ed63d9555deff

commit | commitdiff | tree

Ihab Awad [Mon, 8 Sep 2014 23:05:45 +0000 (23:05 +0000)]

Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:58:01 +0000 (22:58 +0000)]

am 8fd9c6eb: am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

* commit '8fd9c6eb16a3410c941dfdc32e44049d3e77694e':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:57:55 +0000 (22:57 +0000)]

am a24ba624: am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

* commit 'a24ba6244dbec1d1dea674024dd7049f93d1391c':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

commit | commitdiff | tree

RoboErik [Mon, 8 Sep 2014 22:57:39 +0000 (22:57 +0000)]

am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev

* commit 'e8a758713344de3c1ca74fe97470d49e7b2706ea':
Possible fix for dead handler in Music button event sending

commit | commitdiff | tree

Robert Ly [Mon, 8 Sep 2014 22:57:17 +0000 (22:57 +0000)]

am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

* commit '718803f52e7311af2500c0e4ee9aacc2c43882e2':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

commit | commitdiff | tree

Robert Ly [Mon, 8 Sep 2014 22:51:20 +0000 (22:51 +0000)]

am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

* commit 'aa19f1fccb12eb141af92837aded0478006ab935':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:50:16 +0000 (22:50 +0000)]

am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

* commit '7eabd92a14d8804092ffdef8235ecfdae72abef9':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:49:58 +0000 (22:49 +0000)]

am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

* commit 'a4c038a72ad28511f359667cb4ffab31fc0375b2':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

commit | commitdiff | tree

Tsuwei Chen [Mon, 8 Sep 2014 22:48:30 +0000 (22:48 +0000)]

am 62645748: am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev

* commit '626457486cbf5e40c77019f965755ae30b72af22':
Manually merge QC's change for SUPL_ES.

commit | commitdiff | tree

Robert Ly [Mon, 8 Sep 2014 22:43:42 +0000 (22:43 +0000)]

am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

* commit 'b5a21ad3fba1d8d3b096a0d685d71c148fefa11b':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

commit | commitdiff | tree

RoboErik [Mon, 8 Sep 2014 22:35:31 +0000 (22:35 +0000)]

Merge "Possible fix for dead handler in Music button event sending" into lmp-dev

commit | commitdiff | tree

Robert Ly [Mon, 8 Sep 2014 22:30:09 +0000 (22:30 +0000)]

Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

This reverts commit 4186379a2a37123d31ce5d1aff1facc8e7dfbfd3.

Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80

commit | commitdiff | tree

Tsuwei Chen [Mon, 8 Sep 2014 22:28:27 +0000 (22:28 +0000)]

am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev

* commit '38000b0ffd1080e6e8bd9b0607c8916aa9bd0a1b':
Manually merge QC's change for SUPL_ES.

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 22:27:42 +0000 (15:27 -0700)]

Remove unused variables from UsbHostManager.

Change-Id: I68067b69de077667482633cc6ecd97ee94ecb699

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:26:59 +0000 (22:26 +0000)]

am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

* commit '3207948444ed39b867c14cfc314b8caaf60fe571':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:26:53 +0000 (22:26 +0000)]

am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

* commit '7e8786d9755526a2d29c10c60759eb1c290afa38':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

commit | commitdiff | tree

Tsuwei Chen [Mon, 8 Sep 2014 22:15:31 +0000 (22:15 +0000)]

Merge "Manually merge QC's change for SUPL_ES." into lmp-dev

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:13:09 +0000 (22:13 +0000)]

am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

* commit '4186379a2a37123d31ce5d1aff1facc8e7dfbfd3':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 22:13:05 +0000 (22:13 +0000)]

am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

* commit 'c6142d97d79bc6a5ce2bb77fce9ae5d988f49542':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

commit | commitdiff | tree

Andrew Lee [Mon, 8 Sep 2014 22:03:18 +0000 (22:03 +0000)]

am 76abca06: am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev

* commit '76abca06ab13e3aaf995fbacc919254efbc2cc31':
Rename methods/variables on PhoneAccount for API cleanup.

commit | commitdiff | tree

Yorke Lee [Mon, 8 Sep 2014 22:03:12 +0000 (22:03 +0000)]

am 37a32c03: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev

* commit '37a32c038db23533ab1bcc0b14fa48ed61e74a60':
Replace Calls.FEATURES_NONE with 0 (1/4)

commit | commitdiff | tree

Ihab Awad [Wed, 20 Aug 2014 16:36:40 +0000 (09:36 -0700)]

Enable (@hidden) video connection support for RemoteConnections

Bug: 16958934

Change-Id: I2c618743a689303f1bec190da53a1ec42d759370

commit | commitdiff | tree

David Friedman [Mon, 8 Sep 2014 21:58:22 +0000 (21:58 +0000)]

Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

This reverts commit c6142d97d79bc6a5ce2bb77fce9ae5d988f49542.

Change-Id: Idc6fde822bf42300897d96fc934a94e6b9418d76

commit | commitdiff | tree

Andrew Lee [Mon, 8 Sep 2014 21:50:54 +0000 (21:50 +0000)]

am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev

* commit '32e8bc5241d3e048ebe8c94902e5a2b458740f81':
Rename methods/variables on PhoneAccount for API cleanup.

commit | commitdiff | tree

Yorke Lee [Mon, 8 Sep 2014 21:50:47 +0000 (21:50 +0000)]

am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev

* commit 'af99dec488b5eae712253d24ce9f1e85ccfefdeb':
Replace Calls.FEATURES_NONE with 0 (1/4)

commit | commitdiff | tree

Andrew Lee [Mon, 8 Sep 2014 21:45:40 +0000 (21:45 +0000)]

Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev

commit | commitdiff | tree

Yorke Lee [Mon, 8 Sep 2014 21:43:29 +0000 (21:43 +0000)]

Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev

commit | commitdiff | tree

Christoph Studer [Mon, 8 Sep 2014 21:40:02 +0000 (21:40 +0000)]

am a68d6e31: am ea3bd1ac: Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev

* commit 'a68d6e319faf12b304194b85d329b71045385482':
NoMan: Fix speedbump with multiple package priorities

commit | commitdiff | tree

Tom Taylor [Mon, 8 Sep 2014 21:39:57 +0000 (21:39 +0000)]

am 85e674f6: am 15854740: Merge "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId" into lmp-dev

* commit '85e674f6bea8bbeb891d2f09985c0722d516f4db':
DO NOT MERGE - Hide new SmsManager API's dealing with SubId

commit | commitdiff | tree

Christoph Studer [Mon, 8 Sep 2014 21:34:00 +0000 (21:34 +0000)]

am ea3bd1ac: Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev

* commit 'ea3bd1aca9bed0d06b4f164746710c3ea7c5dd43':
NoMan: Fix speedbump with multiple package priorities

commit | commitdiff | tree

Tom Taylor [Mon, 8 Sep 2014 21:27:57 +0000 (21:27 +0000)]

am 15854740: Merge "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId" into lmp-dev

* commit '15854740933385d2560f97ce603afa8549e422b4':
DO NOT MERGE - Hide new SmsManager API's dealing with SubId

commit | commitdiff | tree

Christoph Studer [Mon, 8 Sep 2014 21:26:28 +0000 (21:26 +0000)]

Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev

commit | commitdiff | tree

Tom Taylor [Mon, 8 Sep 2014 21:17:20 +0000 (21:17 +0000)]

Merge "DO NOT MERGE - Hide new SmsManager API's dealing with SubId" into lmp-dev

commit | commitdiff | tree

Michael Wright [Mon, 8 Sep 2014 21:12:24 +0000 (14:12 -0700)]

Allow wake keys to wake dozing device.

The new key interception policy removed the wake status from key
presses while in the device was dozing. Since we still want to wake
from these keys by going from doze -> fully interactive, just don't
remove the wake status and allow the device to be woken up as normal.

Bug: 17422475
Change-Id: I835e51cc9c557d8ce2e8f8502d84f04aae138e79

commit | commitdiff | tree

Chris Wren [Mon, 8 Sep 2014 21:01:01 +0000 (21:01 +0000)]

am 7e5c6e91: am 9330c3e5: Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev

* commit '7e5c6e91b425dce2a4fc98ebdf9ec81ef213825a':
Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.

commit | commitdiff | tree

Kenny Guy [Mon, 8 Sep 2014 21:00:56 +0000 (21:00 +0000)]

am 61512739: am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev

* commit '6151273901851d5338989085b23a0eff0ac61aa3':
Renaming of LauncherApps apis

commit | commitdiff | tree

John Spurlock [Mon, 8 Sep 2014 21:00:51 +0000 (21:00 +0000)]

am 7570a672: am e5feafcd: Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev

* commit '7570a6725701432e74d4a80f4ad2acb7b1f061e7':
Zen: Remove suppression of untagged vibrations in zen mode.

commit | commitdiff | tree

Jorim Jaggi [Mon, 8 Sep 2014 21:00:45 +0000 (21:00 +0000)]

am 18569879: am 7ad90a9a: Merge "Start all resolver activities after keyguard is gone" into lmp-dev

* commit '18569879d0e5884d62315f9267c3704b102e1935':
Start all resolver activities after keyguard is gone

commit | commitdiff | tree

Chris Wren [Mon, 8 Sep 2014 20:50:26 +0000 (20:50 +0000)]

am 9330c3e5: Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev

* commit '9330c3e544107c0da0425ca5e6cd0caec8d475d7':
Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.

commit | commitdiff | tree

Kenny Guy [Mon, 8 Sep 2014 20:50:20 +0000 (20:50 +0000)]

am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev

* commit '4e9c9518f937377fab1afd78c09d5d47a1a11ed1':
Renaming of LauncherApps apis

commit | commitdiff | tree

John Spurlock [Mon, 8 Sep 2014 20:50:15 +0000 (20:50 +0000)]

am e5feafcd: Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev

* commit 'e5feafcd1589bf6e92669df82a545276fa4ab29b':
Zen: Remove suppression of untagged vibrations in zen mode.

commit | commitdiff | tree

Jorim Jaggi [Mon, 8 Sep 2014 20:50:10 +0000 (20:50 +0000)]

am 7ad90a9a: Merge "Start all resolver activities after keyguard is gone" into lmp-dev

* commit '7ad90a9af57d248504b7c33663700db59bebd735':
Start all resolver activities after keyguard is gone

commit | commitdiff | tree

Chris Wren [Mon, 8 Sep 2014 20:47:06 +0000 (20:47 +0000)]

Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev

commit | commitdiff | tree

Kenny Guy [Mon, 8 Sep 2014 20:43:22 +0000 (20:43 +0000)]

Merge "Renaming of LauncherApps apis" into lmp-dev

commit | commitdiff | tree

John Spurlock [Mon, 8 Sep 2014 20:40:45 +0000 (20:40 +0000)]

Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev

commit | commitdiff | tree

Chris Wren [Mon, 8 Sep 2014 20:34:03 +0000 (16:34 -0400)]

Bring consistency to FLAG_ONLY_ALERT_ONCE semantics.

For updates, the sounds layer checks for existence of the flag on the
new version while the heads up was checking for the flag on the
old version.

Both now agree to check the new version.

Bug: 14255617
Change-Id: Ib617df11f0dea17b5dfdf2ef6330bdbd18032ac6

commit | commitdiff | tree

Jorim Jaggi [Mon, 8 Sep 2014 20:38:34 +0000 (20:38 +0000)]

Merge "Start all resolver activities after keyguard is gone" into lmp-dev

commit | commitdiff | tree

Yorke Lee [Mon, 8 Sep 2014 20:33:51 +0000 (13:33 -0700)]

Replace Calls.FEATURES_NONE with 0 (1/4)

Bug: 17253963
Change-Id: I9e9e56cdf4c9a60ac1e047bef0eba2ba0c8f10fb

commit | commitdiff | tree

Craig Mautner [Mon, 8 Sep 2014 20:30:48 +0000 (20:30 +0000)]

am 0e7b0ba3: am 8ffe407a: Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev

* commit '0e7b0ba35c3d4341faf438b86570127ec9543bc2':
Relax requirements on Activity.requestVisibleBehind

commit | commitdiff | tree

Winson Chung [Mon, 8 Sep 2014 20:21:25 +0000 (20:21 +0000)]

am 46e84311: am 3361310f: Ensuring that the start delay matches the transition delay. (Bug 16987565)

* commit '46e84311cdeee13de0cf9093cf15bc474dbe43a1':
Ensuring that the start delay matches the transition delay. (Bug 16987565)

commit | commitdiff | tree

Kenny Guy [Mon, 8 Sep 2014 20:21:08 +0000 (20:21 +0000)]

am 9e9524a4: am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev

* commit '9e9524a4fcd6392114b6f024a21d31e78e62422c':
Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.

commit | commitdiff | tree

Craig Mautner [Mon, 8 Sep 2014 20:20:36 +0000 (20:20 +0000)]

am 8ffe407a: Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev

* commit '8ffe407a65df2c363492e798dd316e816f2ac21e':
Relax requirements on Activity.requestVisibleBehind

commit | commitdiff | tree

John Spurlock [Mon, 8 Sep 2014 20:15:17 +0000 (16:15 -0400)]

Zen: Remove suppression of untagged vibrations in zen mode.

Bug:17313184
Change-Id: I07d24a7d9ce15160a4990391c53d7d6309a13c3e

commit | commitdiff | tree

Craig Mautner [Mon, 8 Sep 2014 20:12:34 +0000 (20:12 +0000)]

Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev

commit | commitdiff | tree

RoboErik [Mon, 8 Sep 2014 20:08:20 +0000 (13:08 -0700)]

Possible fix for dead handler in Music button event sending

I'm still attempting to root cause, but this is a potential fix. I
suspect the callback is getting registerd on a looper that isn't the
main looper which is then getting killed at some point. This change
will make all legacy callbacks happen on the main looper, which should
prevent the state.

bug:17420281
Change-Id: Ia78e694b32b24398d3c09f49d12632755ef45597

commit | commitdiff | tree

Elliott Hughes [Mon, 8 Sep 2014 20:10:02 +0000 (20:10 +0000)]

Merge "resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp

commit | commitdiff | tree

Winson Chung [Mon, 8 Sep 2014 20:09:53 +0000 (20:09 +0000)]

am 3361310f: Ensuring that the start delay matches the transition delay. (Bug 16987565)

* commit '3361310f20013b95ae1e99e0de7b15c6ea422f64':
Ensuring that the start delay matches the transition delay. (Bug 16987565)

commit | commitdiff | tree

Kenny Guy [Mon, 8 Sep 2014 20:09:48 +0000 (20:09 +0000)]

am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev

* commit '652e64d30c2b1d499dbcba93056eaf40b270ad09':
Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.

commit | commitdiff | tree

Elliott Hughes [Mon, 8 Sep 2014 20:08:43 +0000 (13:08 -0700)]

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850

commit | commitdiff | tree

Winson Chung [Mon, 8 Sep 2014 09:38:54 +0000 (11:38 +0200)]

Ensuring that the start delay matches the transition delay. (Bug 16987565)

- Also ensure that the empty text is normal weight

Change-Id: I3227a62fcb39910a402b13f42a6cb9e418f992aa

commit | commitdiff | tree

Jorim Jaggi [Mon, 8 Sep 2014 20:05:18 +0000 (20:05 +0000)]

am b226b3bf: am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev

* commit 'b226b3bfdde6bb1b0a6cf4b7bf40bcb5821784d8':
Restrict line count for BigTextStyle

commit | commitdiff | tree

Kenny Guy [Mon, 8 Sep 2014 20:02:08 +0000 (20:02 +0000)]

Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help