OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 32c2b20c: (-s ours) am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:25 +0000 (18:23 +0000)]
am 32c2b20c: (-s ours) am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '32c2b20cb78258b995cecf8cbb5e38fe44895944':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 3ed46147: (-s ours) am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:20 +0000 (18:23 +0000)]
am 3ed46147: (-s ours) am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '3ed4614798855cf135625c98b6a247a263981e2c':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 9b907157: (-s ours) am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:16 +0000 (18:23 +0000)]
am 9b907157: (-s ours) am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit '9b90715728ee06300c1a8729c553563388301734':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 25d0097f: (-s ours) am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2...
Deepanshu Gupta [Mon, 21 Jul 2014 18:23:12 +0000 (18:23 +0000)]
am 25d0097f: (-s ours) am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit '25d0097f2bf43f5748a36e074d1a68b5bc14a403':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam f7ab7f0a: am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command...
Guang Zhu [Mon, 21 Jul 2014 18:23:08 +0000 (18:23 +0000)]
am f7ab7f0a: am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev

* commit 'f7ab7f0affdae345d0a162002aabfda4742536a8':
  add command to enable bt snoop log

10 years agoam c9476fe0: am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirt...
Jean-Michel Trivi [Mon, 21 Jul 2014 18:23:03 +0000 (18:23 +0000)]
am c9476fe0: am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev

* commit 'c9476fe02e66ae121c0994637a62ea0b6b546c52':
  Hide AudioManager.startBluetoothScoVirtualCall()

10 years agoam 28003199: am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)
Santos Cordon [Mon, 21 Jul 2014 18:22:59 +0000 (18:22 +0000)]
am 28003199: am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)

* commit '280031995f0770e84073a894253b936e4af23566':
  Fixing ADD_CALL (1/3)

10 years agoam 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev
Chris Craik [Mon, 21 Jul 2014 18:22:53 +0000 (18:22 +0000)]
am 0a3bcdcc: am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev

* commit '0a3bcdccb14aa7247463aa91de1cc7e3e1ea148f':
  Tweaks to outline API

10 years agoam bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION...
Adam Powell [Mon, 21 Jul 2014 18:22:48 +0000 (18:22 +0000)]
am bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev

* commit 'bd90f0ce2d052d2e0d753e0cc7b10a1f658b496e':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER

10 years agoam d4c489a8: am c5989521: am c5a8e2f1: Rename voicemail permissions
Yorke Lee [Mon, 21 Jul 2014 18:22:44 +0000 (18:22 +0000)]
am d4c489a8: am c5989521: am c5a8e2f1: Rename voicemail permissions

* commit 'd4c489a867b95431fbab388bbc4cd4da57165e84':
  Rename voicemail permissions

10 years agoam 0924a642: am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app...
Shishir Agrawal [Mon, 21 Jul 2014 18:22:38 +0000 (18:22 +0000)]
am 0924a642: am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev

* commit '0924a6422b3dad4bad0701c1f834cc6b5451ca44':
  Adding the ability for carrier app to override SPN and carrier name.

10 years agoam 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where
Christopher Tate [Mon, 21 Jul 2014 18:22:33 +0000 (18:22 +0000)]
am 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where

* commit '0eebcfd7582d576110a42acb799b8a8c639f693f':
  Fix which index goes where

10 years agoam 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into...
Sreeram Ramachandran [Mon, 21 Jul 2014 18:22:28 +0000 (18:22 +0000)]
am 35de9295: am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev

* commit '35de92955536b6f050e4657ece2028fab67d7f7e':
  Allow VPN interfaces to be put into blocking mode.

10 years agoam 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f2...
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:21 +0000 (18:01 +0000)]
am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '583b68980fd0e1ffac3afe2caf62d7b62dbc3890':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a...
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:16 +0000 (18:01 +0000)]
am 13ebecfe: am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '13ebecfe89e35724736303e677256a7eeee4b3b4':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98...
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:12 +0000 (18:01 +0000)]
am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit 'd2966fce19e04ffc23eb7ecfb65a305c6a22c044':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b...
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:08 +0000 (18:01 +0000)]
am 03b8f56a: am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit '03b8f56a781a231ec11906ea479d8d5490108f24':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable...
Guang Zhu [Sun, 20 Jul 2014 18:00:51 +0000 (18:00 +0000)]
am 1931c1c3: am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev

* commit '1931c1c324908620dc1a875934afea68db0b6d1d':
  add command to enable bt snoop log

10 years agoam abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall(...
Jean-Michel Trivi [Sun, 20 Jul 2014 18:00:37 +0000 (18:00 +0000)]
am abc7f117: am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev

* commit 'abc7f117bf1f8717bc9c62c4762f9c38e15b0fc6':
  Hide AudioManager.startBluetoothScoVirtualCall()

10 years agoam 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)
Santos Cordon [Sun, 20 Jul 2014 18:00:22 +0000 (18:00 +0000)]
am 52cfd31e: am db2f81b0: Fixing ADD_CALL (1/3)

* commit '52cfd31ed48fdacc0ed11d1f2db7eea7f3a17fef':
  Fixing ADD_CALL (1/3)

10 years agoam 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev
Chris Craik [Sun, 20 Jul 2014 18:00:13 +0000 (18:00 +0000)]
am 7339d993: am e25d7792: Merge "Tweaks to outline API" into lmp-dev

* commit '7339d99353deaabfe67b421d3b1d7591c3c74d98':
  Tweaks to outline API

10 years agoam 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER...
Adam Powell [Sun, 20 Jul 2014 18:00:09 +0000 (18:00 +0000)]
am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev

* commit '186802acd1c36b4194804857d9e52e24b74b31cc':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER

10 years agoam c5989521: am c5a8e2f1: Rename voicemail permissions
Yorke Lee [Sun, 20 Jul 2014 18:00:00 +0000 (18:00 +0000)]
am c5989521: am c5a8e2f1: Rename voicemail permissions

* commit 'c59895217922428d3a34ae9635aba7fc4b4f7fc4':
  Rename voicemail permissions

10 years agoam b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN...
Shishir Agrawal [Sun, 20 Jul 2014 17:59:51 +0000 (17:59 +0000)]
am b8addfa0: am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev

* commit 'b8addfa04c98c7c49862150ab6702728fb98a953':
  Adding the ability for carrier app to override SPN and carrier name.

10 years agoam 32523262: am 12e9b896: Fix which index goes where
Christopher Tate [Sun, 20 Jul 2014 17:59:46 +0000 (17:59 +0000)]
am 32523262: am 12e9b896: Fix which index goes where

* commit '32523262b62c4598ffd50873d290c1c601b9f842':
  Fix which index goes where

10 years agoam 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode...
Sreeram Ramachandran [Sun, 20 Jul 2014 17:59:41 +0000 (17:59 +0000)]
am 5e23de19: am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev

* commit '5e23de196c3ac98e5a0da88515bad5d985d348d9':
  Allow VPN interfaces to be put into blocking mode.

10 years agoam c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon...
Winson Chung [Sun, 20 Jul 2014 02:19:27 +0000 (02:19 +0000)]
am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev

* commit 'c655f3a4487d5f810b392460227f0bad91c2768c':
  Add setting to guard the lock-to-app recents icon

10 years agoam 10b49835: am d778b6f5: Fixing issue where we weren\'t restoring touch state on...
Winson Chung [Sun, 20 Jul 2014 02:19:22 +0000 (02:19 +0000)]
am 10b49835: am d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100)

* commit '10b49835cf7496f76e521b14b837326e80ac93e1':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)

10 years agoam b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to...
Ihab Awad [Sun, 20 Jul 2014 02:19:15 +0000 (02:19 +0000)]
am b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev

* commit 'b8c46e3a932f5666c0921b84416d8dfd7a40d727':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata

10 years agoam 7d808d32: am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed...
Ricardo Cervera [Sun, 20 Jul 2014 02:19:04 +0000 (02:19 +0000)]
am 7d808d32: am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

* commit '7d808d3201675401cb42cc036792f46ccb96cd4a':
  docs: Fixed RecyclerView example. Bug: 15973665

10 years agoam c58fee40: am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix...
Robert Ly [Sun, 20 Jul 2014 02:19:00 +0000 (02:19 +0000)]
am c58fee40: am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

* commit 'c58fee40bc72569ff36f186d8f97e708393a0c24':
  docs: Fix typo in Wear docs. Bug: 16327298

10 years agoam 80c212a1: am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting...
Prashant Malani [Sun, 20 Jul 2014 02:18:56 +0000 (02:18 +0000)]
am 80c212a1: am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '80c212a1c54f1fa9c6477f3c36b90e5a38a9d83d':
  Make the booting flag update unconditional

10 years agoam 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller...
Amith Yamasani [Sun, 20 Jul 2014 02:18:46 +0000 (02:18 +0000)]
am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev

* commit '3d1600980675bdd5ba40c9b9633e772031c70108':
  Add a hidden API to expose cross profile caller id check

10 years agoam af5f3b92: am c61f26fa: Make the booting flag update unconditional
Prashant Malani [Sun, 20 Jul 2014 02:18:41 +0000 (02:18 +0000)]
am af5f3b92: am c61f26fa: Make the booting flag update unconditional

* commit 'af5f3b92a7acec0301067ed1cdad857056326e3b':
  Make the booting flag update unconditional

10 years agoam 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs...
Yin-Chia Yeh [Sun, 20 Jul 2014 02:18:36 +0000 (02:18 +0000)]
am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev

* commit '372461a12e3787d829ae2f300e0592ab11972c80':
  Camera2: add highSpeedVideoConfig wrapper and APIs

10 years agoam f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to share...
Dake Gu [Sun, 20 Jul 2014 02:18:26 +0000 (02:18 +0000)]
am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement.

* commit 'f31b6a29ce3fe6cb37668463aaf63e27fa2741de':
  ActivityTransition: fix wrong width/height applied to sharedelement.

10 years agoam 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev
Andre Eisenbach [Sun, 20 Jul 2014 02:18:13 +0000 (02:18 +0000)]
am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev

* commit '1f961f2c95140780e8f63b081a7493508c76a240':
  Reduce GATT logging output

10 years agoam 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev
Niels Egberts [Sun, 20 Jul 2014 02:17:59 +0000 (02:17 +0000)]
am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev

* commit '860e2f9f485ebc81dfad269cca183fee3d03e583':
  Add money as a new TtsSpan type.

10 years agoam b11e7d48: am e0b92a6b: First iteration of a public UsageStats API
Adam Lesinski [Sun, 20 Jul 2014 02:17:49 +0000 (02:17 +0000)]
am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API

* commit 'b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
  First iteration of a public UsageStats API

10 years agoam 0572b33d: am 3406fe19: Add RT-enabled reveal animator
John Reck [Sun, 20 Jul 2014 02:17:41 +0000 (02:17 +0000)]
am 0572b33d: am 3406fe19: Add RT-enabled reveal animator

* commit '0572b33d35d4c6f88d6a720f9b71e0b963c95f1e':
  Add RT-enabled reveal animator

10 years agoam b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed
Zhijun He [Sun, 20 Jul 2014 02:17:31 +0000 (02:17 +0000)]
am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed

* commit 'b62360123f2d4dbf191319ba671bc3781c1a3bf5':
  Camera2: send the partial result with onCaptureProgressed

10 years agoam d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev
Sailesh Nepal [Sun, 20 Jul 2014 02:17:27 +0000 (02:17 +0000)]
am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev

* commit 'd0e9c2273cdaf9919956c5b36298ab1ba62004cf':
  Add Connection.startActivityFromInCall

10 years agoam 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode()
Jean-Michel Trivi [Sun, 20 Jul 2014 02:17:22 +0000 (02:17 +0000)]
am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode()

* commit '4298999e7500356b84bf30ef9b86a83358c2347b':
  Unhide Virtualizer.getVirtualizationMode()

10 years agoam f611c799: am 0587043f: Merge "Use main thread for RemoteConnection callbacks"...
Sailesh Nepal [Sun, 20 Jul 2014 02:17:18 +0000 (02:17 +0000)]
am f611c799: am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev

* commit 'f611c799340afa4f306b9286183b0f4d3eec3ddd':
  Use main thread for RemoteConnection callbacks

10 years agoam 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into...
Jim Miller [Sun, 20 Jul 2014 02:17:13 +0000 (02:17 +0000)]
am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev

* commit '656d09edfddcc748fa56acd455f579cc08057848':
  Add DevicePolicyManager flag for fingerprint.

10 years agoam 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev
Ye Wen [Sun, 20 Jul 2014 02:17:09 +0000 (02:17 +0000)]
am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev

* commit '1100f339df1e089d69690aae5a39ee39f1cc694f':
  Unhide MMS APIs for MSIM (1/2)

10 years agoam cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null.
Dan Sandler [Sun, 20 Jul 2014 02:17:05 +0000 (02:17 +0000)]
am cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null.

* commit 'cd307ff07f3d915f23bb8a2782bf9b08b39aafaf':
  Don't crash if user profile bitmap is null.

10 years agoam 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.
Robert Greenwalt [Sun, 20 Jul 2014 02:17:01 +0000 (02:17 +0000)]
am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.

* commit '8a717ee8b26cdd6d916818451add978c1776bd6e':
  Quit NetworkMonitors at end of life.

10 years agoMerge "Fix removeListener in TrustManagerService."
Jay Civelli [Mon, 21 Jul 2014 16:03:15 +0000 (16:03 +0000)]
Merge "Fix removeListener in TrustManagerService."

10 years agoam 01eca811: am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app...
Winson Chung [Sun, 20 Jul 2014 02:27:30 +0000 (02:27 +0000)]
am 01eca811: am c655f3a4: am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev

* commit '01eca811404a02bcbfe01231d88fe8fa9ac57df3':
  Add setting to guard the lock-to-app recents icon

10 years agoam 1820307c: am 10b49835: am d778b6f5: Fixing issue where we weren\'t restoring touch...
Winson Chung [Sun, 20 Jul 2014 02:27:26 +0000 (02:27 +0000)]
am 1820307c: am 10b49835: am d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100)

* commit '1820307c5bddbf2a680157372aab4213b3fcba75':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)

10 years agoam 9961a6d8: am b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from Phone...
Ihab Awad [Sun, 20 Jul 2014 02:27:21 +0000 (02:27 +0000)]
am 9961a6d8: am b8c46e3a: am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev

* commit '9961a6d8e1a7738e68d64e77871210bfd832c780':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata

10 years agoam 6a4d3c94: am 7d808d32: am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge...
Ricardo Cervera [Sun, 20 Jul 2014 02:27:17 +0000 (02:27 +0000)]
am 6a4d3c94: am 7d808d32: am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

* commit '6a4d3c944861107eca1c4ceae2bc3c3d811af21b':
  docs: Fixed RecyclerView example. Bug: 15973665

10 years agoam 49636d41: am c58fee40: am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge...
Robert Ly [Sun, 20 Jul 2014 02:27:13 +0000 (02:27 +0000)]
am 49636d41: am c58fee40: am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

* commit '49636d41e6aeef1d14d7b52c4ff7d4ef31180772':
  docs: Fix typo in Wear docs. Bug: 16327298

10 years agoam 71af3bd4: am 80c212a1: am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge...
Prashant Malani [Sun, 20 Jul 2014 02:27:06 +0000 (02:27 +0000)]
am 71af3bd4: am 80c212a1: am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '71af3bd4d756074a6ab0c08e948b9bc5ff121f83':
  Make the booting flag update unconditional

10 years agoam 63ddc256: am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profil...
Amith Yamasani [Sun, 20 Jul 2014 02:26:58 +0000 (02:26 +0000)]
am 63ddc256: am 3d160098: am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev

* commit '63ddc256dd126b11f7e6bba473c44e826ac38451':
  Add a hidden API to expose cross profile caller id check

10 years agoam daddf687: am af5f3b92: am c61f26fa: Make the booting flag update unconditional
Prashant Malani [Sun, 20 Jul 2014 02:26:53 +0000 (02:26 +0000)]
am daddf687: am af5f3b92: am c61f26fa: Make the booting flag update unconditional

* commit 'daddf687674143f4d21f2284e28ed371d85dc0bd':
  Make the booting flag update unconditional

10 years agoam ff06075b: am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapp...
Yin-Chia Yeh [Sun, 20 Jul 2014 02:26:49 +0000 (02:26 +0000)]
am ff06075b: am 372461a1: am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev

* commit 'ff06075b8820715e62c9edbd73d13eeb4ed1095e':
  Camera2: add highSpeedVideoConfig wrapper and APIs

10 years agoam b075ffe2: am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height...
Dake Gu [Sun, 20 Jul 2014 02:26:44 +0000 (02:26 +0000)]
am b075ffe2: am f31b6a29: am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement.

* commit 'b075ffe25fb65e037eb5c5d39298d7659e07c18d':
  ActivityTransition: fix wrong width/height applied to sharedelement.

10 years agoam 59d547a8: am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev
Andre Eisenbach [Sun, 20 Jul 2014 02:26:40 +0000 (02:26 +0000)]
am 59d547a8: am 1f961f2c: am decb3109: Merge "Reduce GATT logging output" into lmp-dev

* commit '59d547a81c262ab8d56938b33d02ffc3442febdc':
  Reduce GATT logging output

10 years agoam 8acfe168: am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into...
Niels Egberts [Sun, 20 Jul 2014 02:26:35 +0000 (02:26 +0000)]
am 8acfe168: am 860e2f9f: am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev

* commit '8acfe168f249073a327c835eb6d42d2b8a6b0314':
  Add money as a new TtsSpan type.

10 years agoam 30bf2ec8: am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API
Adam Lesinski [Sun, 20 Jul 2014 02:26:30 +0000 (02:26 +0000)]
am 30bf2ec8: am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API

* commit '30bf2ec83da4cdcafabbdb46c89647a82aa1b857':
  First iteration of a public UsageStats API

10 years agoam 5bed5cc9: am 0572b33d: am 3406fe19: Add RT-enabled reveal animator
John Reck [Sun, 20 Jul 2014 02:26:25 +0000 (02:26 +0000)]
am 5bed5cc9: am 0572b33d: am 3406fe19: Add RT-enabled reveal animator

* commit '5bed5cc982a975ba2080d719911da1758e511d2d':
  Add RT-enabled reveal animator

10 years agoam d6d41238: am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptur...
Zhijun He [Sun, 20 Jul 2014 02:26:21 +0000 (02:26 +0000)]
am d6d41238: am b6236012: am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed

* commit 'd6d412387d8fed4b21e177104901dd22cbd63c28':
  Camera2: send the partial result with onCaptureProgressed

10 years agoam 7841e663: am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall...
Sailesh Nepal [Sun, 20 Jul 2014 02:26:16 +0000 (02:26 +0000)]
am 7841e663: am d0e9c227: am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev

* commit '7841e663348fe6272182c10dbd6472fa25842f3b':
  Add Connection.startActivityFromInCall

10 years agoam 8ff973b4: am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode()
Jean-Michel Trivi [Sun, 20 Jul 2014 02:26:11 +0000 (02:26 +0000)]
am 8ff973b4: am 4298999e: am 115bf42b: Unhide Virtualizer.getVirtualizationMode()

* commit '8ff973b4f5a975a50f880e1cb45f4bf564a070b1':
  Unhide Virtualizer.getVirtualizationMode()

10 years agoam c072996d: am f611c799: am 0587043f: Merge "Use main thread for RemoteConnection...
Sailesh Nepal [Sun, 20 Jul 2014 02:26:06 +0000 (02:26 +0000)]
am c072996d: am f611c799: am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev

* commit 'c072996dc433f0d9d16e475afe00c9a8a617d71f':
  Use main thread for RemoteConnection callbacks

10 years agoam 327d056d: am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for finger...
Jim Miller [Sun, 20 Jul 2014 02:26:01 +0000 (02:26 +0000)]
am 327d056d: am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev

* commit '327d056dca4cc804db27ae9591e20c7026cf1bd2':
  Add DevicePolicyManager flag for fingerprint.

10 years agoam 8535b51d: am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into...
Ye Wen [Sun, 20 Jul 2014 02:25:56 +0000 (02:25 +0000)]
am 8535b51d: am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev

* commit '8535b51d0de6f3ac3bfa566fff2b386291f1dfc0':
  Unhide MMS APIs for MSIM (1/2)

10 years agoam 8c6b5410: am cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null.
Dan Sandler [Sun, 20 Jul 2014 02:25:51 +0000 (02:25 +0000)]
am 8c6b5410: am cd307ff0: am 5239e4d2: Don\'t crash if user profile bitmap is null.

* commit '8c6b54101523808256c8a110b673d7f0309efa92':
  Don't crash if user profile bitmap is null.

10 years agoam 3fbca20c: am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.
Robert Greenwalt [Sun, 20 Jul 2014 02:25:47 +0000 (02:25 +0000)]
am 3fbca20c: am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.

* commit '3fbca20ce58435d20a98391613923258524a4d38':
  Quit NetworkMonitors at end of life.

10 years agoam fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e...
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:48 +0000 (00:48 +0000)]
am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit 'fe48ca3ec644635aa9267c97784f879bee1b984a':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763...
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:45 +0000 (00:48 +0000)]
am d0eed243: am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'd0eed243993e64f8b17147bbc66afe05733376a3':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge...
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:42 +0000 (00:48 +0000)]
am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit '2e11bba3231078749352f371c8e9bb76e3039853':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix defaul...
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:38 +0000 (00:48 +0000)]
am 1ab77f96: am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit '1ab77f9609c8966b960e2bcfbd7d5777aaa7dc24':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours...
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:43 +0000 (00:41 +0000)]
am 4ff3c7f0: (-s ours) am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '4ff3c7f0072d1c56d241b234e7f208009c86112f':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours...
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:39 +0000 (00:41 +0000)]
am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '276ae4eee5450674fbc7e27f638f18ddc748b7f6':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolu...
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:35 +0000 (00:41 +0000)]
am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit '0804e0aded17c1aee8cbd2c34247b390051123c3':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags...
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:31 +0000 (00:41 +0000)]
am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'd7f2bf067fce644ed902122fffb9e22b6596a0ff':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log...
Guang Zhu [Sat, 19 Jul 2014 00:40:28 +0000 (00:40 +0000)]
am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev

* commit '5a0f7e414e9a41ebc3845d0158f59afd8899d8b1':
  add command to enable bt snoop log

10 years agoam 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev
Jean-Michel Trivi [Sat, 19 Jul 2014 00:36:05 +0000 (00:36 +0000)]
am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev

* commit '981fcf46c2876541de3fe1e6c030899c582ae198':
  Hide AudioManager.startBluetoothScoVirtualCall()

10 years agoam f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
Guang Zhu [Sat, 19 Jul 2014 00:33:58 +0000 (00:33 +0000)]
am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev

* commit 'f59ce46880ebe2c2466a2c862ec2ed401f635d51':
  add command to enable bt snoop log

10 years agoam db2f81b0: Fixing ADD_CALL (1/3)
Santos Cordon [Sat, 19 Jul 2014 00:28:01 +0000 (00:28 +0000)]
am db2f81b0: Fixing ADD_CALL (1/3)

* commit 'db2f81b07d0b29e2fff87be3293945fd9aeaf13d':
  Fixing ADD_CALL (1/3)

10 years agoFixing ADD_CALL (1/3)
Santos Cordon [Fri, 18 Jul 2014 20:40:29 +0000 (13:40 -0700)]
Fixing ADD_CALL (1/3)

Bug: 16241726
Change-Id: Ie1dd72a79c2430b10b0239dbdda5508edbc8eb26

10 years agoam e25d7792: Merge "Tweaks to outline API" into lmp-dev
Chris Craik [Sat, 19 Jul 2014 00:23:13 +0000 (00:23 +0000)]
am e25d7792: Merge "Tweaks to outline API" into lmp-dev

* commit 'e25d7792af090ef3c692ad157c3cbfeadf1db7b8':
  Tweaks to outline API

10 years agoam d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
Adam Powell [Sat, 19 Jul 2014 00:23:09 +0000 (00:23 +0000)]
am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev

* commit 'd0cb5fd810d1b9002c330435da89c1465deb8d37':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER

10 years agoam c5a8e2f1: Rename voicemail permissions
Yorke Lee [Sat, 19 Jul 2014 00:19:03 +0000 (00:19 +0000)]
am c5a8e2f1: Rename voicemail permissions

* commit 'c5a8e2f13cc92802768aacac4ae3baa9676db422':
  Rename voicemail permissions

10 years agoRename voicemail permissions
Yorke Lee [Fri, 18 Jul 2014 23:24:29 +0000 (16:24 -0700)]
Rename voicemail permissions

Rename READ_ALL_VOICEMAIL to READ_VOICEMAIL, and MANAGE_VOICEMAIL
to WRITE_VOICEMAIL

Bug: 16400686
Change-Id: I4c87a7e2fb3aa71d7de3865301f110bcfb29221b

10 years agoam 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier...
Shishir Agrawal [Sat, 19 Jul 2014 00:11:11 +0000 (00:11 +0000)]
am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev

* commit '47bbd4608e423efd310a894b275724792268beba':
  Adding the ability for carrier app to override SPN and carrier name.

10 years agoam 12e9b896: Fix which index goes where
Christopher Tate [Sat, 19 Jul 2014 00:06:46 +0000 (00:06 +0000)]
am 12e9b896: Fix which index goes where

* commit '12e9b896f1fb40489a56e7ade81ffc807eb17065':
  Fix which index goes where

10 years agoam 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev
Sreeram Ramachandran [Sat, 19 Jul 2014 00:06:43 +0000 (00:06 +0000)]
am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev

* commit '4000b01f1eb14e6e1a4a9c1aa955193ced7d5d94':
  Allow VPN interfaces to be put into blocking mode.

10 years agoFix which index goes where
Christopher Tate [Sat, 19 Jul 2014 00:01:40 +0000 (17:01 -0700)]
Fix which index goes where

Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6

10 years agoam 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev
Winson Chung [Fri, 18 Jul 2014 23:50:59 +0000 (23:50 +0000)]
am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev

* commit '51b044a29d73fc05c95ecf0e237efc531adbb3cb':
  Add setting to guard the lock-to-app recents icon

10 years agoFix removeListener in TrustManagerService.
Jay Civelli [Fri, 18 Jul 2014 23:47:36 +0000 (16:47 -0700)]
Fix removeListener in TrustManagerService.

The removeListener method was not removing listeners.

Change-Id: Icd5366f03f8fc9c3d283c7b4416b9cff3c75cc59

10 years agoam d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task...
Winson Chung [Fri, 18 Jul 2014 23:46:53 +0000 (23:46 +0000)]
am d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100)

* commit 'd778b6f58cfbe68d7ce5f769e4146d88d14bfdc6':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)

10 years agoFixing issue where we weren't restoring touch state on dismissed Task cards. (Bug...
Winson Chung [Fri, 18 Jul 2014 01:39:02 +0000 (18:39 -0700)]
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)

10 years agoam 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMet...
Ihab Awad [Fri, 18 Jul 2014 23:38:46 +0000 (23:38 +0000)]
am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev

* commit '98abc9d111449309a718c76842e9fef05f08f4bd':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata

10 years agoam 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView...
Ricardo Cervera [Fri, 18 Jul 2014 23:23:35 +0000 (23:23 +0000)]
am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

* commit '3b74e3787a5853f6094f55d6649fadf4518c1cb5':
  docs: Fixed RecyclerView example. Bug: 15973665

10 years agoam ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear...
Robert Ly [Fri, 18 Jul 2014 23:23:32 +0000 (23:23 +0000)]
am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

* commit 'ec571ec09d9b745ee0400f5109ccf80d96f67fc4':
  docs: Fix typo in Wear docs. Bug: 16327298

10 years agoam 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update...
Prashant Malani [Fri, 18 Jul 2014 23:23:28 +0000 (23:23 +0000)]
am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '269ac24ff2e4409d07a965c864ab2c4bf5636e05':
  Make the booting flag update unconditional