OSDN Git Service

android-x86/frameworks-base.git
9 years agoam e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into...
Christopher Tate [Thu, 4 Dec 2014 21:17:37 +0000 (21:17 +0000)]
am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev

* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
  Adjust wallpaper-restore acceptance criteria

9 years agoam 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 20:24:28 +0000 (20:24 +0000)]
am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '2dadff70d46dd13ba2e51e8ecd5601c6f2f602d3':
  Import translations. DO NOT MERGE

9 years agoam 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 20:24:11 +0000 (20:24 +0000)]
am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '3b05d2bd6fe7a674537dc87aade5673746c96780':
  Import translations. DO NOT MERGE

9 years agoam 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 20:24:01 +0000 (20:24 +0000)]
am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '2253b8c576182256139a9b18195aef451f7e134a':
  Import translations. DO NOT MERGE

9 years agoam 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into...
Robert Greenwalt [Thu, 4 Dec 2014 20:23:55 +0000 (20:23 +0000)]
am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type

9 years agoam 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system...
Eino-Ville Talvala [Thu, 4 Dec 2014 20:23:45 +0000 (20:23 +0000)]
am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
  Revert "Camera: Add new capability flags as system features as well"

9 years agoam e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone...
Dianne Hackborn [Thu, 4 Dec 2014 20:23:25 +0000 (20:23 +0000)]
am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev

* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
  Fix issue #17948584: Application crash and phone restart when app...

9 years agoam 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material...
Alan Viverette [Thu, 4 Dec 2014 20:23:18 +0000 (20:23 +0000)]
am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev

* commit '3977137d865637297b4723ec8784d5b97fc316dc':
  Slightly more button elevation to match Material spec

9 years agoam 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system...
Dianne Hackborn [Thu, 4 Dec 2014 20:23:11 +0000 (20:23 +0000)]
am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev

* commit '4c4e4686d5de3f22cf4d832c63716d9054b9ad54':
  Fix issue #18607384: Run fstrim after every system update

9 years agoam 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
Yin-Chia Yeh [Thu, 4 Dec 2014 20:23:00 +0000 (20:23 +0000)]
am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev

* commit '871571ae0c4d8f334265b99e274892346756d51b':
  Camera: update antibanding spec

9 years agoam 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"
Craig Mautner [Thu, 4 Dec 2014 19:51:23 +0000 (19:51 +0000)]
am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"

* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
  Prevent ANR when broadcast receiver is killed

9 years agoam 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"
Chih-hung Hsieh [Thu, 4 Dec 2014 19:51:15 +0000 (19:51 +0000)]
am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

* commit '0ebbfaedd7fd843229d289baa69fffd33eab2985':
  Add -Wno-unused-parameter to LOCAL_CFLAGS

9 years agoam e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"
Craig Mautner [Thu, 4 Dec 2014 15:16:11 +0000 (15:16 +0000)]
am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"

* commit 'e879b2ae69bf7ef159dbdc068423526d5db99df0':
  Prevent ANR when broadcast receiver is killed

9 years agoam ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"
Chih-hung Hsieh [Thu, 4 Dec 2014 15:16:04 +0000 (15:16 +0000)]
am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

* commit 'ccce6e0f9f6f4da95d61fb2cfb1253ac662fba30':
  Add -Wno-unused-parameter to LOCAL_CFLAGS

9 years agoam 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
Christopher Tate [Thu, 4 Dec 2014 15:14:43 +0000 (15:14 +0000)]
am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev

* commit '758f45217d9b7d257258ea41aa53f6364ac13918':
  Adjust wallpaper-restore acceptance criteria

9 years agoam 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"
Adam Lesinski [Thu, 4 Dec 2014 09:21:45 +0000 (09:21 +0000)]
am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"

* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 05:44:57 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 05:05:32 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 4 Dec 2014 04:39:34 +0000 (04:39 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoMerge "Prevent ANR when broadcast receiver is killed"
Craig Mautner [Thu, 4 Dec 2014 01:56:39 +0000 (01:56 +0000)]
Merge "Prevent ANR when broadcast receiver is killed"

9 years agoPrevent ANR when broadcast receiver is killed
Kenji Sugimoto [Thu, 17 Jul 2014 05:50:41 +0000 (14:50 +0900)]
Prevent ANR when broadcast receiver is killed

If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.

As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.

Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.

Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a

9 years agoMerge "Add -Wno-unused-parameter to LOCAL_CFLAGS"
Chih-hung Hsieh [Thu, 4 Dec 2014 01:04:09 +0000 (01:04 +0000)]
Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

9 years agoMerge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
Christopher Tate [Wed, 3 Dec 2014 23:09:32 +0000 (23:09 +0000)]
Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev

9 years agoam 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev
Robert Greenwalt [Wed, 3 Dec 2014 23:00:34 +0000 (23:00 +0000)]
am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
  Separate voice/data roaming state and type

9 years agoam d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as...
Eino-Ville Talvala [Wed, 3 Dec 2014 23:00:15 +0000 (23:00 +0000)]
am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
  Revert "Camera: Add new capability flags as system features as well"

9 years agoMerge "Separate voice/data roaming state and type" into lmp-mr1-dev
Robert Greenwalt [Wed, 3 Dec 2014 22:18:23 +0000 (22:18 +0000)]
Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

9 years agoMerge "Revert "Camera: Add new capability flags as system features as well"" into...
Eino-Ville Talvala [Wed, 3 Dec 2014 22:01:40 +0000 (22:01 +0000)]
Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

9 years agoam f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when...
Dianne Hackborn [Wed, 3 Dec 2014 21:38:08 +0000 (21:38 +0000)]
am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev

* commit 'f696efa206089bde1274d972239ffb5a8185f613':
  Fix issue #17948584: Application crash and phone restart when app...

9 years agoMerge "Fix issue #17948584: Application crash and phone restart when app..." into...
Dianne Hackborn [Wed, 3 Dec 2014 21:32:15 +0000 (21:32 +0000)]
Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev

9 years agoam d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp...
Alan Viverette [Wed, 3 Dec 2014 21:12:30 +0000 (21:12 +0000)]
am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev

* commit 'd3adf0986ba53b794ac8f8b70a8784ca6945d4ba':
  Slightly more button elevation to match Material spec

9 years agoam 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into...
Dianne Hackborn [Wed, 3 Dec 2014 21:12:24 +0000 (21:12 +0000)]
am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev

* commit '281f36f5483ade3800092a42109327347d8aaff6':
  Fix issue #18607384: Run fstrim after every system update

9 years agoMerge "Slightly more button elevation to match Material spec" into lmp-mr1-dev
Alan Viverette [Wed, 3 Dec 2014 21:10:18 +0000 (21:10 +0000)]
Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev

9 years agoAdjust wallpaper-restore acceptance criteria
Christopher Tate [Wed, 3 Dec 2014 21:07:24 +0000 (13:07 -0800)]
Adjust wallpaper-restore acceptance criteria

Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.

Bug 18448052

Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7

9 years agoMerge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev
Dianne Hackborn [Wed, 3 Dec 2014 21:06:52 +0000 (21:06 +0000)]
Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev

9 years agoam 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev
Yin-Chia Yeh [Wed, 3 Dec 2014 20:54:23 +0000 (20:54 +0000)]
am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev

* commit '381343088f964b6428c483f741424a50ef41cb49':
  Camera: update antibanding spec

9 years agoam 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO...
Michael Wright [Wed, 3 Dec 2014 20:54:16 +0000 (20:54 +0000)]
am 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev

* commit '83de9a426ab3d8f1e1473fd438ab9cde3d65f283':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE

9 years agoam 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp...
Michael Wright [Wed, 3 Dec 2014 20:54:10 +0000 (20:54 +0000)]
am 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev

* commit '70d8133cc3db2742980ec4157322c08eaebf6e6b':
  Added Razer USA, Ltd serval DO NOT MERGE

9 years agoFix issue #18607384: Run fstrim after every system update
Dianne Hackborn [Wed, 3 Dec 2014 20:44:48 +0000 (12:44 -0800)]
Fix issue #18607384: Run fstrim after every system update

Change-Id: I06f4c0b9e6834a8c8bd85710dfd9fa16471b6ad2

9 years agoam 06eaac44: am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev
John Spurlock [Wed, 3 Dec 2014 20:44:30 +0000 (20:44 +0000)]
am 06eaac44: am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev

* commit '06eaac4463015d9ff93c694603bb9398b065f502':
  Doze: Fast path for pickup pulses.

9 years agoMerge "Camera: update antibanding spec" into lmp-mr1-dev
Yin-Chia Yeh [Wed, 3 Dec 2014 20:44:03 +0000 (20:44 +0000)]
Merge "Camera: update antibanding spec" into lmp-mr1-dev

9 years agoam 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
Sreeram Ramachandran [Wed, 3 Dec 2014 20:43:50 +0000 (20:43 +0000)]
am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev

* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
  Fix docs per API review.

9 years agoam 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user...
Etan Cohen [Wed, 3 Dec 2014 20:43:46 +0000 (20:43 +0000)]
am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)

* commit '89b55fc52d0ad20013353af32e7d4823d95db575':
  Add a global override for VoLTE calls (which leaves user setting in place)

9 years agoam 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp...
Craig Mautner [Wed, 3 Dec 2014 20:43:40 +0000 (20:43 +0000)]
am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev

* commit '56f10c2685dd6f69c57744896e9bc7db129da447':
  Handle keyguard dismiss flags correctly

9 years agoam 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add...
Trevor Johns [Wed, 3 Dec 2014 20:43:03 +0000 (20:43 +0000)]
am 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs

* commit '9aa9e46b4e02e5f39752d93a3aa0645ede056fa9':
  Docs: Add "admin" to samples categories

9 years agoam f560f334: am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove...
Trevor Johns [Wed, 3 Dec 2014 20:42:58 +0000 (20:42 +0000)]
am f560f334: am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs

* commit 'f560f334b0784ebeea86997d391e1245590d131d':
  Docs: Remove NavigationDrawer sample from What's New page

9 years agoam 2047e6a0: am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove...
Trevor Johns [Wed, 3 Dec 2014 20:42:51 +0000 (20:42 +0000)]
am 2047e6a0: am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs

* commit '2047e6a0d1f40e2187f1d7b9f8c7d2d5e97ec8cf':
  Docs: Remove GitHub links from docs/samples/new/index.html

9 years agoam 50511096: am de9848c6: Merge "Initial changes to add callback on task stack change...
Winson Chung [Wed, 3 Dec 2014 20:42:45 +0000 (20:42 +0000)]
am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev

* commit '50511096998ffff4fa5c001e46b056201fb0b892':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)

9 years agoam 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp...
Evan Charlton [Wed, 3 Dec 2014 20:42:39 +0000 (20:42 +0000)]
am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev

* commit '10dff0a710b46cc1ddf554e6c83941a201aa6150':
  Re-add Connection.getCallCapabilities

9 years agoam a1163d57: am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging...
Nancy Chen [Wed, 3 Dec 2014 20:42:34 +0000 (20:42 +0000)]
am a1163d57: am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev

* commit 'a1163d575b41580352e39dde455ef2f1f7fbcbf4':
  Change a semi-colon to a colon in AudioState logging.

9 years agoam 3107a9ad: am f805ba7d: Merge "Retry failed network validation every 10 minutes...
Paul Jensen [Wed, 3 Dec 2014 20:42:28 +0000 (20:42 +0000)]
am 3107a9ad: am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev

* commit '3107a9ad244004938ff7d5d731b3973113344da4':
  Retry failed network validation every 10 minutes.

9 years agoam 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard...
Adam Lesinski [Wed, 3 Dec 2014 20:42:22 +0000 (20:42 +0000)]
am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev

* commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8':
  AAPT: Add pathMotion custom classes to Proguard Keep set

9 years agoam bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state...
Dianne Hackborn [Wed, 3 Dec 2014 20:42:17 +0000 (20:42 +0000)]
am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev

* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
  Work on issue #18572506: AppOps in-memory state is invalid after...

9 years agoam da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into...
Michael Wright [Wed, 3 Dec 2014 20:41:52 +0000 (20:41 +0000)]
am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev

* commit 'da79c87f2e4502b02c29e9081dcdf52a742d29e5':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE

9 years agoam 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev
Michael Wright [Wed, 3 Dec 2014 20:41:47 +0000 (20:41 +0000)]
am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev

* commit '22458842cf0f86044856e6bc3c3a5fb2eda00862':
  Added Razer USA, Ltd serval DO NOT MERGE

9 years agoam b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" into lmp...
Adrian Roos [Wed, 3 Dec 2014 20:41:45 +0000 (20:41 +0000)]
am b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev

* commit 'b67d8ef66540bfb72db44721f353c661d1f88144':
  Refresh user list a little more eagerly

9 years agoam 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into...
Svetoslav [Wed, 3 Dec 2014 20:41:39 +0000 (20:41 +0000)]
am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev

* commit '5303451efc8553f83d921185c6aac30a178d632f':
  Inconsistent media sizes for es-US locale.

9 years agoam d6b001f1: am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp...
Jason Monk [Wed, 3 Dec 2014 20:41:33 +0000 (20:41 +0000)]
am d6b001f1: am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev

* commit 'd6b001f154d7c1038edba4e7729b2aeb0124d359':
  Don't show no sim icon on wifi devices

9 years agoam b0607472: am 195c4388: Fixing bugs in the LLand.
Daniel Sandler [Wed, 3 Dec 2014 20:41:27 +0000 (20:41 +0000)]
am b0607472: am 195c4388: Fixing bugs in the LLand.

* commit 'b06074723fbed960749bab2b6e6b7e013f012e6a':
  Fixing bugs in the LLand.

9 years agoam 5f23693b: am 3f6755f5: CEC: Check command type for power status monitor action
Jinsuk Kim [Wed, 3 Dec 2014 20:41:21 +0000 (20:41 +0000)]
am 5f23693b: am 3f6755f5: CEC: Check command type for power status monitor action

* commit '5f23693b5cad0647a6bd95ba50dc87bb9023e864':
  CEC: Check command type for power status monitor action

9 years agoam 418eecb6: am dad92f36: Merge "Don\'t process windows belonging to unshown users...
Craig Mautner [Wed, 3 Dec 2014 20:41:15 +0000 (20:41 +0000)]
am 418eecb6: am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev

* commit '418eecb6f870e4fc4dbb5715f61afd51827fe8a5':
  Don't process windows belonging to unshown users

9 years agoam d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into...
Lorenzo Colitti [Wed, 3 Dec 2014 20:41:10 +0000 (20:41 +0000)]
am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev

* commit 'd99cd44f317a0e1b188a0033ebe4948f13c32491':
  Make StatusBar display all default networks.

9 years agoam 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame...
Filip Gruszczynski [Wed, 3 Dec 2014 20:40:56 +0000 (20:40 +0000)]
am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev

* commit '0821a56668aa0289b137eb510f35aed54784dc3b':
  Add overscan insets to surface frame dimensions in WallpaperService.

9 years agoam 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev
Dongwon Kang [Wed, 3 Dec 2014 20:40:45 +0000 (20:40 +0000)]
am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev

* commit '25a051880666022163b9a641737f26adc31e5477':
  TIF: call tune() in HardwareSession

9 years agoMerge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev
Michael Wright [Wed, 3 Dec 2014 20:34:32 +0000 (20:34 +0000)]
Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev

9 years agoMerge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev
Michael Wright [Wed, 3 Dec 2014 20:34:18 +0000 (20:34 +0000)]
Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev

9 years agoam 8e1b08ac: am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick...
Sanket Padawe [Wed, 3 Dec 2014 20:25:24 +0000 (20:25 +0000)]
am 8e1b08ac: am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev

* commit '8e1b08ac261324f85f53ce2991df83ef53dfd2bf':
  Call entitlement on clicking tethering tile in quick settings.

9 years agoam e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context flags and...
Jason Sams [Wed, 3 Dec 2014 20:25:19 +0000 (20:25 +0000)]
am e4c82550: (-s ours) am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev

* commit 'e4c825507dfcb2559ecf6401d06fa5a7ecc8e721':
  Fix bug in passing of context flags and version.

9 years agoam cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev
John Spurlock [Wed, 3 Dec 2014 19:56:12 +0000 (19:56 +0000)]
am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev

* commit 'cdf7f984870344de1b1237e2a7749a3e32b2b688':
  Doze: Fast path for pickup pulses.

9 years agoam 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev
Sreeram Ramachandran [Wed, 3 Dec 2014 19:50:19 +0000 (19:50 +0000)]
am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev

* commit '932c33214729fe2d2b09f82ef60a72871f182654':
  Fix docs per API review.

9 years agoam 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in...
Etan Cohen [Wed, 3 Dec 2014 19:50:13 +0000 (19:50 +0000)]
am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place)

* commit '7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0':
  Add a global override for VoLTE calls (which leaves user setting in place)

9 years agoam a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
Craig Mautner [Wed, 3 Dec 2014 19:49:46 +0000 (19:49 +0000)]
am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev

* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
  Handle keyguard dismiss flags correctly

9 years agoMerge "Doze: Fast path for pickup pulses." into lmp-mr1-dev
John Spurlock [Wed, 3 Dec 2014 19:49:24 +0000 (19:49 +0000)]
Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Dec 2014 19:47:54 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Fix docs per API review." into lmp-mr1-dev
Sreeram Ramachandran [Wed, 3 Dec 2014 19:15:36 +0000 (19:15 +0000)]
Merge "Fix docs per API review." into lmp-mr1-dev

9 years agoRevert "Camera: Add new capability flags as system features as well"
Eino-Ville Talvala [Wed, 3 Dec 2014 18:54:50 +0000 (18:54 +0000)]
Revert "Camera: Add new capability flags as system features as well"

This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da.
But leaves in some of the improved documentation.

Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb

9 years agoAdd a global override for VoLTE calls (which leaves user setting in place)
Etan Cohen [Mon, 24 Nov 2014 19:18:01 +0000 (11:18 -0800)]
Add a global override for VoLTE calls (which leaves user setting in place)

Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc

9 years agoFix docs per API review.
Sreeram Ramachandran [Wed, 3 Dec 2014 18:53:35 +0000 (10:53 -0800)]
Fix docs per API review.

Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144

9 years agoDoze: Fast path for pickup pulses.
John Spurlock [Tue, 2 Dec 2014 15:41:25 +0000 (10:41 -0500)]
Doze: Fast path for pickup pulses.

Decrease the pulse duration when pulsing for pickup.
Add an option to skip the proximity check entirely, but don't
turn it on yet.

Bug: 18373928
Change-Id: I54f8dee004229193a18d488759bf797a16470cab

9 years agoMerge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev
Craig Mautner [Wed, 3 Dec 2014 18:41:28 +0000 (18:41 +0000)]
Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev

9 years agoam 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to sampl...
Trevor Johns [Wed, 3 Dec 2014 18:36:30 +0000 (18:36 +0000)]
am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs

* commit '5244ab68e4aae1dd95f87e690f7df83c0e630cef':
  Docs: Add "admin" to samples categories

9 years agoam e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDra...
Trevor Johns [Wed, 3 Dec 2014 18:36:25 +0000 (18:36 +0000)]
am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs

* commit 'e218d0d3b5feb21e96ccbae62a67dfe5cb3d2ce5':
  Docs: Remove NavigationDrawer sample from What's New page

9 years agoam 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links...
Trevor Johns [Wed, 3 Dec 2014 18:36:20 +0000 (18:36 +0000)]
am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs

* commit '4360c12bcbe1fa36b7aacdda70eb6ac2cf48454a':
  Docs: Remove GitHub links from docs/samples/new/index.html

9 years agoam de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672...
Winson Chung [Wed, 3 Dec 2014 18:36:15 +0000 (18:36 +0000)]
am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev

* commit 'de9848c641e1b1e0f73e5655c3f8c0c3b34a011c':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)

9 years agoam 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
Evan Charlton [Wed, 3 Dec 2014 18:36:10 +0000 (18:36 +0000)]
am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev

* commit '5ce118d1f4bdaaa1e85626d06d473b2dece949c3':
  Re-add Connection.getCallCapabilities

9 years agoam 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp...
Nancy Chen [Wed, 3 Dec 2014 18:36:02 +0000 (18:36 +0000)]
am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev

* commit '6963ff0e059977c901f4a961a24e7ffd3536af23':
  Change a semi-colon to a colon in AudioState logging.

9 years agoam f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev
Paul Jensen [Wed, 3 Dec 2014 18:35:57 +0000 (18:35 +0000)]
am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev

* commit 'f805ba7dcc0e3cde052e2d5a84dedd478f206806':
  Retry failed network validation every 10 minutes.

9 years agoam 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into...
Adam Lesinski [Wed, 3 Dec 2014 18:35:52 +0000 (18:35 +0000)]
am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev

* commit '91ca64ea291fceb43514b459ba76d13abc80f506':
  AAPT: Add pathMotion custom classes to Proguard Keep set

9 years agoam ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after...
Dianne Hackborn [Wed, 3 Dec 2014 18:35:46 +0000 (18:35 +0000)]
am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev

* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289':
  Work on issue #18572506: AppOps in-memory state is invalid after...

9 years agoFix issue #17948584: Application crash and phone restart when app...
Dianne Hackborn [Wed, 3 Dec 2014 18:20:30 +0000 (10:20 -0800)]
Fix issue #17948584: Application crash and phone restart when app...

...is installed with <provider> with empty string.

Don't allow empty authorities, just like we don't allow null authorities.

Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2

9 years agoam b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories...
Trevor Johns [Wed, 3 Dec 2014 18:12:47 +0000 (18:12 +0000)]
am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs

* commit 'b769fc0c576f485022330b40ae5180fb23cc53ee':
  Docs: Add "admin" to samples categories

9 years agoam 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample...
Trevor Johns [Wed, 3 Dec 2014 18:12:37 +0000 (18:12 +0000)]
am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs

* commit '25bc6be2843fcff1be9c074f1e92dac1ce76d809':
  Docs: Remove NavigationDrawer sample from What's New page

9 years agoam 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs...
Trevor Johns [Wed, 3 Dec 2014 18:12:31 +0000 (18:12 +0000)]
am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs

* commit '740b22a522a224f88196ba33e06178e6a576f411':
  Docs: Remove GitHub links from docs/samples/new/index.html

9 years agoMerge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug...
Winson Chung [Wed, 3 Dec 2014 18:10:36 +0000 (18:10 +0000)]
Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev

9 years agoMerge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
Evan Charlton [Wed, 3 Dec 2014 18:09:30 +0000 (18:09 +0000)]
Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev

9 years agoMerge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev
Nancy Chen [Wed, 3 Dec 2014 18:05:56 +0000 (18:05 +0000)]
Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev

9 years agoRe-add Connection.getCallCapabilities
Sailesh Nepal [Tue, 2 Dec 2014 23:18:25 +0000 (15:18 -0800)]
Re-add Connection.getCallCapabilities

This method wasn't supposed to be removed.

Bug: 18594044
Bug: 18292176
Change-Id: Iac4cc0972643a8271957e480d3f48d50243af271

9 years agoMerge "Retry failed network validation every 10 minutes." into lmp-mr1-dev
Paul Jensen [Wed, 3 Dec 2014 18:04:27 +0000 (18:04 +0000)]
Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev

9 years agoMerge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev
Adam Lesinski [Wed, 3 Dec 2014 18:04:22 +0000 (18:04 +0000)]
Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev

9 years agoMerge "Work on issue #18572506: AppOps in-memory state is invalid after..." into...
Dianne Hackborn [Wed, 3 Dec 2014 18:03:25 +0000 (18:03 +0000)]
Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev

9 years agoWork on issue #18572506: AppOps in-memory state is invalid after...
Dianne Hackborn [Wed, 3 Dec 2014 02:32:20 +0000 (18:32 -0800)]
Work on issue #18572506: AppOps in-memory state is invalid after...

...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9