OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d4492b09: am a67a3924: (-s ours) am 70004d9f: docs: fix build errors due to linked...
Joe Fernandez [Thu, 27 Aug 2015 19:58:43 +0000 (19:58 +0000)]
am d4492b09: am a67a3924: (-s ours) am 70004d9f: docs: fix build errors due to linked apache http classes

* commit 'd4492b09aebaf41beabe1d89062dc03f03e62ef7':

9 years agoam 8761eae1: am 770a8b4f: (-s ours) am 28f2ba8e: docs: Remove Google Play Services...
Quddus Chong [Thu, 27 Aug 2015 19:58:33 +0000 (19:58 +0000)]
am 8761eae1: am 770a8b4f: (-s ours) am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.

* commit '8761eae1cabd30d0e8c212db16210ecc7e751bd1':

9 years agoam 5492c1f7: am 2cfba6dc: (-s ours) am 85429c0d: docs: Android 5.1 API Release notes...
Joe Fernandez [Thu, 27 Aug 2015 19:58:21 +0000 (19:58 +0000)]
am 5492c1f7: am 2cfba6dc: (-s ours) am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)

* commit '5492c1f7543734a0fcb2efbbafde24fff6b7e824':

9 years agoam 26d9af2b: am c4876464: (-s ours) am 637db47e: docs: SDK Tools v23.3.4 release...
Joe Fernandez [Thu, 27 Aug 2015 19:58:12 +0000 (19:58 +0000)]
am 26d9af2b: am c4876464: (-s ours) am 637db47e: docs: SDK Tools v23.3.4 release download links

* commit '26d9af2b2f507c118ab854772faf1dafc80e5ed0':

9 years agoam 34fb234f: am e6b2a1e9: (-s ours) am 0baf95bf: docs: SDK Tools Release notes for...
Joe Fernandez [Thu, 27 Aug 2015 19:57:55 +0000 (19:57 +0000)]
am 34fb234f: am e6b2a1e9: (-s ours) am 0baf95bf: docs: SDK Tools Release notes for v24.3.4

* commit '34fb234f974683659a5bbfff31e15dc2a84fd301':

9 years agoam 7910ed41: am 882c34d2: (-s ours) am 472b6b44: docs: Platform release notes for...
Joe Fernandez [Thu, 27 Aug 2015 19:57:44 +0000 (19:57 +0000)]
am 7910ed41: am 882c34d2: (-s ours) am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1

* commit '7910ed41366c37caeda5d2b2c62743688da9cb97':

9 years agoam 2b3d1ec8: am 83b1ad4a: (-s ours) am 6a3016d2: Merge "docs: Build Tools 23.0.0...
Joe Fernandez [Thu, 27 Aug 2015 19:57:30 +0000 (19:57 +0000)]
am 2b3d1ec8: am 83b1ad4a: (-s ours) am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

* commit '2b3d1ec8bf9f0a997a7a9946bfa63ff990cfe841':

9 years agoam 9bbd9016: am a6262543: (-s ours) am bd4ed32f: docs: Preview 3 - Support page updates
Joe Fernandez [Thu, 27 Aug 2015 19:57:15 +0000 (19:57 +0000)]
am 9bbd9016: am a6262543: (-s ours) am bd4ed32f: docs: Preview 3 - Support page updates

* commit '9bbd9016cc7869a2a534ce45e4f896e96561c396':

9 years agoam 563c8999: am ae6771e9: (-s ours) am 42c22d04: Merge "Doc change: Edits for final...
Dirk Dougherty [Thu, 27 Aug 2015 19:57:05 +0000 (19:57 +0000)]
am 563c8999: am ae6771e9: (-s ours) am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

* commit '563c8999d0be732e0b1f98b0f00d9ddb56e8e460':

9 years agoam d2957c85: am fdcd2637: (-s ours) am bf8f17f8: docs: Update Preview downloads page...
Joe Fernandez [Thu, 27 Aug 2015 19:56:56 +0000 (19:56 +0000)]
am d2957c85: am fdcd2637: (-s ours) am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3

* commit 'd2957c854c7a73c17f075b4c84b0cbe4b032a816':

9 years agoam de74eeff: am bee84879: (-s ours) am 5c7817bc: Merge "Update the RenderScript runti...
Joe Fernandez [Thu, 27 Aug 2015 19:56:47 +0000 (19:56 +0000)]
am de74eeff: am bee84879: (-s ours) am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev

* commit 'de74eeffb81dd2b4d84f22ebe9501af0d0b8f743':

9 years agoam cedfd49d: am 293b85ba: (-s ours) Merge "Fix pessimizing move." into mnc-dev-plus...
Dan Albert [Thu, 27 Aug 2015 19:56:39 +0000 (19:56 +0000)]
am cedfd49d: am 293b85ba: (-s ours) Merge "Fix pessimizing move." into mnc-dev-plus-aosp

* commit 'cedfd49d4ccb2ff5bc10b9c4041f2fbc1b301f68':
  Fix pessimizing move.

9 years agoam 7c0ed29e: am c964884e: (-s ours) am 1017f986: Merge "Camera2: Add camera type...
Eino-Ville Talvala [Thu, 27 Aug 2015 19:56:31 +0000 (19:56 +0000)]
am 7c0ed29e: am c964884e: (-s ours) am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit '7c0ed29ee1d83eb0d6170548cb52fa42466d831d':

9 years agoam f4c6e3b9: am b22f33e8: (-s ours) am 6fa531e0: Merge "docs: Updated gms_lists.js...
Quddus Chong [Thu, 27 Aug 2015 19:56:23 +0000 (19:56 +0000)]
am f4c6e3b9: am b22f33e8: (-s ours) am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev

* commit 'f4c6e3b9f2e26a4387ec01381d62f8b96710e20f':

9 years agoam c2c9d3b9: am 398eeaaa: (-s ours) am fbf170cb: Merge "docs: API diff report 22...
Joe Fernandez [Thu, 27 Aug 2015 19:56:16 +0000 (19:56 +0000)]
am c2c9d3b9: am 398eeaaa: (-s ours) am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev

* commit 'c2c9d3b9d4f9e5643a57b089cf7ca1a20a0f4846':

9 years agoam bb09705d: am d2acabba: (-s ours) am 886e382d: Merge "docs: Added Javadoc links...
Andrew Solovay [Thu, 27 Aug 2015 19:56:06 +0000 (19:56 +0000)]
am bb09705d: am d2acabba: (-s ours) am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

* commit 'bb09705d287ef9fcaaaec6c98fed241199f75309':

9 years agoam cd3cd39c: am c973ebac: (-s ours) am 5bd5c25e: Merge "Docs: Migration, rewrite...
David Friedman [Thu, 27 Aug 2015 19:55:58 +0000 (19:55 +0000)]
am cd3cd39c: am c973ebac: (-s ours) am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev

* commit 'cd3cd39c55330d41f73b7b3fab2c5e55dc235b0d':

9 years agoam 4d3c5033: am 090341d7: (-s ours) am 63d3a610: (-s ours) am e3f0a881: Merge "Make...
Chris Craik [Thu, 27 Aug 2015 19:55:49 +0000 (19:55 +0000)]
am 4d3c5033: am 090341d7: (-s ours) am 63d3a610: (-s ours) am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work"

* commit '4d3c5033360cc50275bbb0a65d2b30d02f9b0e63':

9 years agoam 4b84e45a: am b774ed20: (-s ours) am 06f552cf: Merge "Add debugging for issue ...
Dianne Hackborn [Thu, 27 Aug 2015 19:55:39 +0000 (19:55 +0000)]
am 4b84e45a: am b774ed20: (-s ours) am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

* commit '4b84e45a8befbf5c1ec94dfa2669aad8b3594eb6':

9 years agoam 4d8c0e46: am 3ed2a4e1: (-s ours) am eee09f49: Merge "cherrypick from mnc-preview...
Andrew Solovay [Thu, 27 Aug 2015 19:55:29 +0000 (19:55 +0000)]
am 4d8c0e46: am 3ed2a4e1: (-s ours) am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev

* commit '4d8c0e460a328f1cd74f9e806c95a8c5ea3bb32d':

9 years agoam bf88bbc0: am f13f1efa: (-s ours) am 16e5aba9: am 4a2a890b: Merge "Fix mismatched...
Dan Albert [Thu, 27 Aug 2015 19:55:18 +0000 (19:55 +0000)]
am bf88bbc0: am f13f1efa: (-s ours) am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."

* commit 'bf88bbc0ac7ac86ba9f1dd188127e2586ebfbc29':

9 years agoam 04158398: am 9a9fd61e: (-s ours) am 0cd143ad: Merge "AAPT: Fix regression in resou...
Adam Lesinski [Thu, 27 Aug 2015 19:55:07 +0000 (19:55 +0000)]
am 04158398: am 9a9fd61e: (-s ours) am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '041583989e02045641f9548412525f4fb17ce467':

9 years agoam 38043149: am 930fa6d6: (-s ours) am b8fb239a: Merge "docs: Updated API Overview...
Quddus Chong [Thu, 27 Aug 2015 19:54:55 +0000 (19:54 +0000)]
am 38043149: am 930fa6d6: (-s ours) am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev

* commit '38043149103ca5b7e283cffe808b42913de06d84':

9 years agoam 8b24f263: am 72c982fa: (-s ours) am 9f238a94: Merge "Introducing M Land." into...
Daniel Sandler [Thu, 27 Aug 2015 19:54:47 +0000 (19:54 +0000)]
am 8b24f263: am 72c982fa: (-s ours) am 9f238a94: Merge "Introducing M Land." into mnc-dev

* commit '8b24f2639f18a5c8c98ac4924ff693809308ab53':

9 years agoam edfa8cec: am fa42d28f: (-s ours) am 8ad3e817: Merge ""I tried to think of the...
Daniel Sandler [Thu, 27 Aug 2015 19:54:37 +0000 (19:54 +0000)]
am edfa8cec: am fa42d28f: (-s ours) am 8ad3e817: Merge ""I tried to think of the most harmless thing."" into mnc-dev

* commit 'edfa8cec1d4a21cd4d43f30f3978709b10943b46':

9 years agoam c28ef534: am 4fe0a446: (-s ours) am 504600bb: Merge "Fix UserHandle.getAppIdFromSh...
Adam Lesinski [Thu, 27 Aug 2015 19:54:29 +0000 (19:54 +0000)]
am c28ef534: am 4fe0a446: (-s ours) am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev

* commit 'c28ef53405a091c3cc40b40fe716672f5dde7f8c':

9 years agoam 8b6fe362: am 9eec1c2a: (-s ours) am 7df411d0: Merge "Clear calling identity before...
Julia Reynolds [Thu, 27 Aug 2015 19:54:21 +0000 (19:54 +0000)]
am 8b6fe362: am 9eec1c2a: (-s ours) am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev

* commit '8b6fe362ed75b459612cf7ec70ec305ec679af08':

9 years agoam 71cc66ef: am 2f160d38: (-s ours) am 16fa58cb: Merge "Fix to check the incoming...
Jean-Michel Trivi [Thu, 27 Aug 2015 19:54:14 +0000 (19:54 +0000)]
am 71cc66ef: am 2f160d38: (-s ours) am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

* commit '71cc66efa91430d9fe0808b6928921cb657c7c2b':

9 years agoam 997252fe: am d7a164bf: (-s ours) am 7e7d79ef: Merge "Make "Ask every time" actuall...
Chris Tate [Thu, 27 Aug 2015 19:54:07 +0000 (19:54 +0000)]
am 997252fe: am d7a164bf: (-s ours) am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '997252feb61bdfcacd2732af59efaad39ceb7a98':

9 years agoam 221b008d: am 3ffc0f1e: (-s ours) am 81f3a85a: Merge "Fix issue #22940169: "pm...
Dianne Hackborn [Thu, 27 Aug 2015 19:53:58 +0000 (19:53 +0000)]
am 221b008d: am 3ffc0f1e: (-s ours) am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

* commit '221b008d831848f422d3f7fdceca7f2c5b519afd':

9 years agoam b4c9875d: am 03e64e4e: (-s ours) am b045331f: Merge "Add GTS test to ensure valid...
Svetoslav Ganov [Thu, 27 Aug 2015 19:53:49 +0000 (19:53 +0000)]
am b4c9875d: am 03e64e4e: (-s ours) am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

* commit 'b4c9875dc1ba30e0e32fa058009978e8dd250770':

9 years agoam f2d79c6e: am b53738f7: (-s ours) am cfcf6af9: Merge "Method to show DialogFragment...
Jeff Sharkey [Thu, 27 Aug 2015 19:53:37 +0000 (19:53 +0000)]
am f2d79c6e: am b53738f7: (-s ours) am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev

* commit 'f2d79c6e7dcfb25d18cfb326b4a7d3ba22b1896b':

9 years agoam 7fc4365c: am 619bbdf4: (-s ours) am 37dd5240: Merge "Doc change: Update preview...
Joe Fernandez [Thu, 27 Aug 2015 19:53:25 +0000 (19:53 +0000)]
am 7fc4365c: am 619bbdf4: (-s ours) am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev

* commit '7fc4365cc88fb0e38d056a729becdeaca25b99a3':

9 years agoam 9a5ef253: am 8de9d445: (-s ours) am 81eeef58: Merge "Update time when turning...
Jorim Jaggi [Thu, 27 Aug 2015 19:53:12 +0000 (19:53 +0000)]
am 9a5ef253: am 8de9d445: (-s ours) am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev

* commit '9a5ef25328f0f3a732f8269d9d953af18be5edf6':

9 years agoam e2993d3a: am c245093f: (-s ours) am f7557729: Merge "docs: Update uses-sdk-element...
Joe Fernandez [Thu, 27 Aug 2015 19:52:57 +0000 (19:52 +0000)]
am e2993d3a: am c245093f: (-s ours) am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev

* commit 'e2993d3af0c77df8222f78f6d90de3d91fd79497':

9 years agoam ba7fa27b: am 9f65f0a2: (-s ours) am 8d149d7f: Merge "docs: Update developer docs...
Joe Fernandez [Thu, 27 Aug 2015 19:52:36 +0000 (19:52 +0000)]
am ba7fa27b: am 9f65f0a2: (-s ours) am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev

* commit 'ba7fa27ba9ca2b4eb031fb1c94d009e33e76dcc4':

9 years agoam 15966a6b: am 93eef423: (-s ours) am 226ae04d: Merge "Set default SMS/MMS app to...
Mike Dodd [Thu, 27 Aug 2015 19:52:14 +0000 (19:52 +0000)]
am 15966a6b: am 93eef423: (-s ours) am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev

* commit '15966a6b1b9f5e3c68b20c850db8c02eee58f69b':

9 years agoam f941b080: am 692e9b34: (-s ours) am 90460c79: Merge "Add more intelligence to...
Jason Monk [Thu, 27 Aug 2015 19:51:50 +0000 (19:51 +0000)]
am f941b080: am 692e9b34: (-s ours) am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev

* commit 'f941b0806ae2e1402fadba903006418a6a07c1a5':

9 years agoMerge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform...
Bart Sears [Thu, 27 Aug 2015 19:51:41 +0000 (19:51 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

9 years agoam 878d6edc: am 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout...
Bart Sears [Thu, 27 Aug 2015 19:51:27 +0000 (19:51 +0000)]
am 878d6edc: am 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

* commit '878d6edc9a2a8e087768b7feab054cbc98e657f3':

9 years agoMerge "Initial commit of UiBench"
Chris Craik [Thu, 27 Aug 2015 19:51:19 +0000 (19:51 +0000)]
Merge "Initial commit of UiBench"

9 years agoam 6abb7a6a: am 6d52d761: (-s ours) am ff9912d5: Merge "Fix issue #23116383: Include...
Dianne Hackborn [Thu, 27 Aug 2015 19:51:10 +0000 (19:51 +0000)]
am 6abb7a6a: am 6d52d761: (-s ours) am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '6abb7a6a9b8cafb0cebd85c6531b12fdfcbd3251':

9 years agoam a6bb2ab4: am 25919834: (-s ours) am c97509c0: Merge "Update ifaces when global...
Jeff Sharkey [Thu, 27 Aug 2015 19:50:59 +0000 (19:50 +0000)]
am a6bb2ab4: am 25919834: (-s ours) am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev

* commit 'a6bb2ab445e4c87a62122e9b01c476746b11616d':

9 years agoam 9a7b1205: am 715bb2f6: (-s ours) am f3ae2603: am 10e0f079: Merge "SELinuxPolicyIns...
Nick Kralevich [Thu, 27 Aug 2015 19:50:49 +0000 (19:50 +0000)]
am 9a7b1205: am 715bb2f6: (-s ours) am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin."

* commit '9a7b1205ed5097c8a62f2cf7674e5cfea53a0b6d':

9 years agoam 29c77cc9: am 3255e2f9: (-s ours) Merge "Hwui: Remove unused variables" into mnc...
Andreas Gampe [Thu, 27 Aug 2015 19:50:40 +0000 (19:50 +0000)]
am 29c77cc9: am 3255e2f9: (-s ours) Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp

* commit '29c77cc98a2bcd006d746b46902af93e4a7c05de':
  Hwui: Remove unused variables

9 years agoam 3c73845a: am 17b4be07: (-s ours) am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROI...
Elliott Hughes [Thu, 27 Aug 2015 19:50:27 +0000 (19:50 +0000)]
am 3c73845a: am 17b4be07: (-s ours) am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."

* commit '3c73845aaaf287ec345043333f8226530ea196b1':

9 years agoam 9b771ef2: am 9dc2d5cd: (-s ours) am beabcb92: Merge "Fix Insertion ActionMode...
Raph Levien [Thu, 27 Aug 2015 19:50:17 +0000 (19:50 +0000)]
am 9b771ef2: am 9dc2d5cd: (-s ours) am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev

* commit '9b771ef261f6a4b7096a42623028adc080c6df09':

9 years agoam 00d75244: am 09c62671: (-s ours) am 242ff8a8: Merge "Camera: Fix framework bugs...
Eino-Ville Talvala [Thu, 27 Aug 2015 19:50:06 +0000 (19:50 +0000)]
am 00d75244: am 09c62671: (-s ours) am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev

* commit '00d75244d71c5b3a365c34b72d43be0163931703':

9 years agoam 54398118: am fdc169c1: (-s ours) am ad285c16: Merge "Revert "Set default SMS/MMS...
Mike Dodd [Thu, 27 Aug 2015 19:49:54 +0000 (19:49 +0000)]
am 54398118: am fdc169c1: (-s ours) am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev

* commit '5439811865918d0fa2486ac40db95e6eeb818c26':

9 years agoam 3c78910f: am 44a80e20: (-s ours) am c0a4883d: Merge "Prevent overlap of color...
Adrian Roos [Thu, 27 Aug 2015 19:49:34 +0000 (19:49 +0000)]
am 3c78910f: am 44a80e20: (-s ours) am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev

* commit '3c78910f2b4053f288f6127a83a009e324e1c3fd':

9 years agoam d347b957: am fab69aaa: (-s ours) am 0c762957: Merge "Fix tuner for secondary users...
Jason Monk [Thu, 27 Aug 2015 19:49:18 +0000 (19:49 +0000)]
am d347b957: am fab69aaa: (-s ours) am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev

* commit 'd347b957fb6c7dea1bf2f3da362fb29ecec555ff':

9 years agoam 9e2a4f79: am c1372049: (-s ours) am 7f2f96cc: Merge "Set default SMS/MMS app to...
Mike Dodd [Thu, 27 Aug 2015 19:49:04 +0000 (19:49 +0000)]
am 9e2a4f79: am c1372049: (-s ours) am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev

* commit '9e2a4f79b4783f584d5f3efbeaec35fcdf8ce246':

9 years agoam 9317fb4f: am b56511a7: (-s ours) am 24e4d48f: Merge "Promote system app permission...
Todd Kennedy [Thu, 27 Aug 2015 19:48:44 +0000 (19:48 +0000)]
am 9317fb4f: am b56511a7: (-s ours) am 24e4d48f: Merge "Promote system app permissions" into mnc-dev

* commit '9317fb4fdfd4e8a62bd77c15485a101519927def':

9 years agoam e5f46c5c: am 782fd147: (-s ours) am e20493ea: Merge "Log last filtered sensor...
Michael Wright [Thu, 27 Aug 2015 19:48:26 +0000 (19:48 +0000)]
am e5f46c5c: am 782fd147: (-s ours) am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev

* commit 'e5f46c5caa3918460573fdfeb40e425302ab453e':

9 years agoam 7f20371e: am d29382aa: (-s ours) am bf88205b: Fall back to persist.sys.language...
Narayan Kamath [Thu, 27 Aug 2015 19:48:03 +0000 (19:48 +0000)]
am 7f20371e: am d29382aa: (-s ours) am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.

* commit '7f20371e21d0445a4ab4afa563af475ea894387b':

9 years agoam a0462aa6: am d03c38e7: (-s ours) am e19b76cb: Merge "Add more examples of generati...
Alex Klyubin [Thu, 27 Aug 2015 19:47:40 +0000 (19:47 +0000)]
am a0462aa6: am d03c38e7: (-s ours) am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev

* commit 'a0462aa62e6ca76f2f6019dc73d8cf2af5e7bc61':

9 years agoam a3c6faaa: am 6ceed53e: (-s ours) am e022cb08: Merge "Don\'t attempt to stop the...
Lorenzo Colitti [Thu, 27 Aug 2015 19:47:19 +0000 (19:47 +0000)]
am a3c6faaa: am 6ceed53e: (-s ours) am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev

* commit 'a3c6faaa400b207ce642b5ff7f7d7f683e9ca5bb':

9 years agoam 0d164952: am 47c5338b: (-s ours) am 968fc3ab: Merge "Fix deadlock." into mnc-dev
Carlos Valdivia [Thu, 27 Aug 2015 19:46:55 +0000 (19:46 +0000)]
am 0d164952: am 47c5338b: (-s ours) am 968fc3ab: Merge "Fix deadlock." into mnc-dev

* commit '0d164952253e58f7cef8f0ad6da0afd406ef98fb':

9 years agoam 9736c5ca: am c787d8bc: (-s ours) am 77b0d6e9: Merge "New landscape Navigation...
Julia Reynolds [Thu, 27 Aug 2015 19:46:36 +0000 (19:46 +0000)]
am 9736c5ca: am c787d8bc: (-s ours) am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev

* commit '9736c5cac2a6aa13aa6557163c203f9816a609f1':

9 years agoam 2607d591: am 6c55ec30: (-s ours) am 59123b9b: Merge "When closing task stack remov...
Filip Gruszczynski [Thu, 27 Aug 2015 19:46:24 +0000 (19:46 +0000)]
am 2607d591: am 6c55ec30: (-s ours) am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev

* commit '2607d59110c2aa9ed6bc3d5ef5cb88b6f882116b':

9 years agoam a292bb06: am 75a3f8f1: (-s ours) am 15f704e7: Merge "Fix issue #23122445: Add...
Dianne Hackborn [Thu, 27 Aug 2015 19:46:13 +0000 (19:46 +0000)]
am a292bb06: am 75a3f8f1: (-s ours) am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev

* commit 'a292bb06a4926d4ac4dc0f3616ed2b3dbf3b77dc':

9 years agoam f5efac4f: am b2a979a3: (-s ours) am e43d43c3: Merge "Fixed issue with moveTaskToBa...
Wale Ogunwale [Thu, 27 Aug 2015 19:46:02 +0000 (19:46 +0000)]
am f5efac4f: am b2a979a3: (-s ours) am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev

* commit 'f5efac4f717ac895b2b7a869531c09269dea82fb':

9 years agoam ab2f7577: am bb5b3ca2: (-s ours) am 494d6e9b: [fingerprint] use credential owner...
Andres Morales [Thu, 27 Aug 2015 19:45:51 +0000 (19:45 +0000)]
am ab2f7577: am bb5b3ca2: (-s ours) am 494d6e9b: [fingerprint] use credential owner in FingerprintService

* commit 'ab2f7577641d836609e8b1ec1ff8a14bc9d27651':

9 years agoam eed809f2: am a01479f5: (-s ours) am 8851608d: Merge "Always call onProvidersChange...
Winson Chung [Thu, 27 Aug 2015 19:45:34 +0000 (19:45 +0000)]
am eed809f2: am a01479f5: (-s ours) am 8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev

* commit 'eed809f2c446208be2313d8679da6b43c81f443d':

9 years agoam 510829ad: am 3080ceb1: (-s ours) am 19aa341a: Merge "Save data registration roamin...
Chris Manton [Thu, 27 Aug 2015 19:45:24 +0000 (19:45 +0000)]
am 510829ad: am 3080ceb1: (-s ours) am 19aa341a: Merge "Save data registration roaming state" into mnc-dev

* commit '510829adc3d407a2625b5222fd8213e862a38b7e':

9 years agoam f52da5e2: am 0dcad221: (-s ours) am 7d85b543: Merge "Make DelegateManager thread...
Diego Perez [Thu, 27 Aug 2015 19:45:14 +0000 (19:45 +0000)]
am f52da5e2: am 0dcad221: (-s ours) am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev

* commit 'f52da5e2abd975f79e70660440dedfc51806d2e7':

9 years agoam c7bc365b: am d764de10: (-s ours) am 105febd2: Merge "Don\'t re-wrap alert dialog...
Alan Viverette [Thu, 27 Aug 2015 19:45:03 +0000 (19:45 +0000)]
am c7bc365b: am d764de10: (-s ours) am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev

* commit 'c7bc365b3fbb8084f851730074406b5e5413b141':

9 years agoam 8147a24a: am db0af526: (-s ours) am 11104791: Merge "Ensure ripple mask is drawn...
Alan Viverette [Thu, 27 Aug 2015 19:44:49 +0000 (19:44 +0000)]
am 8147a24a: am db0af526: (-s ours) am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev

* commit '8147a24a84e39df8ceff3e2e1fb6b4bf69001d9e':

9 years agoam 4d2a67ca: am 3288e632: (-s ours) am b4eb0640: Merge "Avoid use-after-free race...
Alan Viverette [Thu, 27 Aug 2015 19:44:37 +0000 (19:44 +0000)]
am 4d2a67ca: am 3288e632: (-s ours) am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev

* commit '4d2a67ca3fc2594f34742bb855843b5781b9067e':

9 years agoam d39d1cfb: am f18a0cfe: (-s ours) am ad7719de: Merge "Crash apps with bad notificat...
Daniel Sandler [Thu, 27 Aug 2015 19:44:23 +0000 (19:44 +0000)]
am d39d1cfb: am f18a0cfe: (-s ours) am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev

* commit 'd39d1cfb464070975815aa1ed7ca5d3b5dc42de6':

9 years agoam 9545a483: am 9e08ac0d: (-s ours) am 4dbb37ae: Merge "Update setApplicationRestrict...
Esteban Talavera [Thu, 27 Aug 2015 19:44:14 +0000 (19:44 +0000)]
am 9545a483: am 9e08ac0d: (-s ours) am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev

* commit '9545a4831135ec06945186a92013cec5bc6ce40b':

9 years agoam f983730c: am af7855ff: (-s ours) am b08c24a3: Frameworks/base: Disable Clang in...
Andreas Gampe [Thu, 27 Aug 2015 19:44:04 +0000 (19:44 +0000)]
am f983730c: am af7855ff: (-s ours) am b08c24a3: Frameworks/base: Disable Clang in core/jni

* commit 'f983730c1c662063126826c891f7d94118a5be75':

9 years agoam babc502b: am 85aed84e: (-s ours) am c00b1067: Merge "Pushing the startActivity...
Winson Chung [Thu, 27 Aug 2015 19:43:54 +0000 (19:43 +0000)]
am babc502b: am 85aed84e: (-s ours) am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev

* commit 'babc502b6e5a1fb7fa43dc21cc97b686244b0aad':

9 years agoam 74125c85: am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cance...
Jorim Jaggi [Thu, 27 Aug 2015 19:43:44 +0000 (19:43 +0000)]
am 74125c85: am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev

* commit '74125c85b169212dfd61565cbf8bd8ce1204c97c':

9 years agoam 06afac56: am 919e7cad: (-s ours) am b2b02092: Merge "Fix issue #23037899: Support...
Dianne Hackborn [Thu, 27 Aug 2015 19:43:34 +0000 (19:43 +0000)]
am 06afac56: am 919e7cad: (-s ours) am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev

* commit '06afac56602dee941c8badcbc1f7f1380b52afe5':

9 years agoam 4ccf97ad: (-s ours) am 48d58aad: (-s ours) am 77d5b914: Merge "DO NOT MERGE: Idle...
Matthew Williams [Thu, 27 Aug 2015 19:43:24 +0000 (19:43 +0000)]
am 4ccf97ad: (-s ours) am 48d58aad: (-s ours) am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

* commit '4ccf97ad219830fea4c9649e6a59337c663bd60d':

9 years agoam bba876e9: am 2403e51c: (-s ours) am 5d05a24c: Merge "Fix wifi disable during resto...
Chris Tate [Thu, 27 Aug 2015 19:43:14 +0000 (19:43 +0000)]
am bba876e9: am 2403e51c: (-s ours) am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev

* commit 'bba876e9ebcaa87fe07196f06bff3e2da8e01626':

9 years agoam f368684c: am cb312965: (-s ours) am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS...
Simranjit Kohli [Thu, 27 Aug 2015 19:43:00 +0000 (19:43 +0000)]
am f368684c: am cb312965: (-s ours) am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev

* commit 'f368684c924bce1c6859eb3fbbb54d5daac5730e':

9 years agoam dcadfce8: am 081905c5: (-s ours) am c5283927: Close ZipFiles correctly in WebViewF...
Torne (Richard Coles) [Thu, 27 Aug 2015 19:42:49 +0000 (19:42 +0000)]
am dcadfce8: am 081905c5: (-s ours) am c5283927: Close ZipFiles correctly in WebViewFactory.

* commit 'dcadfce8f8e180ea05959f054b16cf17ab05a8ff':

9 years agoam 50836801: am eda0838f: (-s ours) am 4218e46a: Merge "Initialize network name bette...
Jason Monk [Thu, 27 Aug 2015 19:42:39 +0000 (19:42 +0000)]
am 50836801: am eda0838f: (-s ours) am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev

* commit '5083680185efd38374b1bab92677facd22f5844a':

9 years agoam f706adbe: am 624037df: (-s ours) am a2e39c6a: Merge "Filtering Remote-Submix and...
Paul Mclean [Thu, 27 Aug 2015 19:42:30 +0000 (19:42 +0000)]
am f706adbe: am 624037df: (-s ours) am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev

* commit 'f706adbe653fb18bde5af17dfcd15e725ecfbf97':

9 years agoam e4c060bb: am ef23eb24: (-s ours) am beda6e2b: Merge "Revert "Add a (hidden) mappin...
Paul Mclean [Thu, 27 Aug 2015 19:42:20 +0000 (19:42 +0000)]
am e4c060bb: am ef23eb24: (-s ours) am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev

* commit 'e4c060bbbc40d6eedbb93102c2dc79187c9b5396':

9 years agoam 9fb4323c: am 8a23ad62: (-s ours) am 90b030ba: Merge "Do not show removed permissio...
Svetoslav Ganov [Thu, 27 Aug 2015 19:42:10 +0000 (19:42 +0000)]
am 9fb4323c: am 8a23ad62: (-s ours) am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev

* commit '9fb4323cbfd2cf2fa88afb056a99f9984305c29a':

9 years agoam 8a58c18e: am 416605e4: (-s ours) am fc81be94: Merge "Fix issue #23037093: "Write...
Dianne Hackborn [Thu, 27 Aug 2015 19:42:02 +0000 (19:42 +0000)]
am 8a58c18e: am 416605e4: (-s ours) am fc81be94: Merge "Fix issue #23037093: "Write system settings" permission value fails..." into mnc-dev

* commit '8a58c18e88b6db9ef27f0e5c5e040b02a9eebac4':

9 years agoam 62cd2aa6: am 199edc5c: (-s ours) am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NET...
Billy Lau [Thu, 27 Aug 2015 19:41:53 +0000 (19:41 +0000)]
am 62cd2aa6: am 199edc5c: (-s ours) am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '62cd2aa6ca1ecf98043c59c1c077c0eebf709f05':

9 years agoam 7a9a1140: am 10faec4b: (-s ours) am f0e5501e: Merge "Fix issue #22989030: Separate...
Dianne Hackborn [Thu, 27 Aug 2015 19:41:43 +0000 (19:41 +0000)]
am 7a9a1140: am 10faec4b: (-s ours) am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev

* commit '7a9a1140220a692a37039c76fd227ebbf21e65aa':

9 years agoam 5f02146c: am 6dc2ac39: (-s ours) am 9d929558: Merge "Correctly skip files that...
Matthew Williams [Thu, 27 Aug 2015 19:41:31 +0000 (19:41 +0000)]
am 5f02146c: am 6dc2ac39: (-s ours) am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev

* commit '5f02146c82c57ba85d7d900fe0e28d0aa8f910c4':

9 years agoam 02bffbf1: am cf9b8251: (-s ours) am 14b884c1: am daf8d905: Merge "Add ICU as a...
Neil Fuller [Thu, 27 Aug 2015 19:41:11 +0000 (19:41 +0000)]
am 02bffbf1: am cf9b8251: (-s ours) am 14b884c1: am daf8d905: Merge "Add ICU as a java library for docs."

* commit '02bffbf14cfb348aa9fa2ba1fb6d48e3edfd232a':

9 years agoam c50175b4: am 1451df28: (-s ours) am 027e3b7f: Merge "Fix check for caller being...
Shirish Kalele [Thu, 27 Aug 2015 19:40:52 +0000 (19:40 +0000)]
am c50175b4: am 1451df28: (-s ours) am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev

* commit 'c50175b44100eac5193571f5828ab608d2bbf58b':

9 years agoam 40fa5e7b: am d63cb337: (-s ours) am 288e82f8: Merge "Keep intent verification...
Nicolas Prévot [Thu, 27 Aug 2015 19:40:30 +0000 (19:40 +0000)]
am 40fa5e7b: am d63cb337: (-s ours) am 288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev

* commit '40fa5e7b6606863ef5e6dccd1d4f68667f84c259':

9 years agoam bf085a8e: am 936d2022: (-s ours) am 9dc4d50b: Merge "Update Navigation bar assets...
Julia Reynolds [Thu, 27 Aug 2015 19:40:09 +0000 (19:40 +0000)]
am bf085a8e: am 936d2022: (-s ours) am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev

* commit 'bf085a8e12b174c2671abc6ab0d3cf6755a5e64a':

9 years agoam 74bd71be: am 59769181: (-s ours) am 69ed3308: Merge "Allow system to disable locks...
Jason Monk [Thu, 27 Aug 2015 19:40:01 +0000 (19:40 +0000)]
am 74bd71be: am 59769181: (-s ours) am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev

* commit '74bd71bebef0e55ee61cc3023e29d444e80ca365':

9 years agoam 914c176f: am d512325a: (-s ours) am 1fbc1b3b: Merge "Fix partial user cleanup...
Amith Yamasani [Thu, 27 Aug 2015 19:39:54 +0000 (19:39 +0000)]
am 914c176f: am d512325a: (-s ours) am 1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev

* commit '914c176fc6e78586c4d800971342ac8963977540':

9 years agoam 992de812: am d39fb4af: (-s ours) am c376afb4: Merge "Wait a bit longer for wifi...
Chris Tate [Thu, 27 Aug 2015 19:39:46 +0000 (19:39 +0000)]
am 992de812: am d39fb4af: (-s ours) am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev

* commit '992de812889492a7bad5f62aa6408a7190396308':

9 years agoam 7b362749: am 0e8b4fa0: (-s ours) am 3d06ea03: Merge "Debugging for issue #22556778...
Dianne Hackborn [Thu, 27 Aug 2015 19:39:38 +0000 (19:39 +0000)]
am 7b362749: am 0e8b4fa0: (-s ours) am 3d06ea03: Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev

* commit '7b362749f6f810870afe6a7dc185af7907efbc0b':

9 years agoam 4e465dad: am 207c6908: (-s ours) am 53d6cddb: Merge "Fix issue #22846750: Starting...
Dianne Hackborn [Thu, 27 Aug 2015 19:39:31 +0000 (19:39 +0000)]
am 4e465dad: am 207c6908: (-s ours) am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev

* commit '4e465dad5b7240d4d0e585330e6155d6a5a28f75':

9 years agoam b5d4f689: (-s ours) am 56700e24: (-s ours) am d7255cfb: Merge "DO NOT MERGE. Add...
Michael Wright [Thu, 27 Aug 2015 19:39:23 +0000 (19:39 +0000)]
am b5d4f689: (-s ours) am 56700e24: (-s ours) am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev

* commit 'b5d4f689d11afa2c0d7a1c6691afc56fdd23d6c1':

9 years agoam b9f94678: am c9d50277: (-s ours) am 38d30dc5: Merge "Immediately kill a shared...
Svetoslav Ganov [Thu, 27 Aug 2015 19:39:13 +0000 (19:39 +0000)]
am b9f94678: am c9d50277: (-s ours) am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev

* commit 'b9f946789fea8431a0a73cd8574bc787d26e7c35':

9 years agoam cc828be1: am 0607e785: (-s ours) am 77566dd1: Merge "Use BluetoothController for...
Jason Monk [Thu, 27 Aug 2015 19:39:05 +0000 (19:39 +0000)]
am cc828be1: am 0607e785: (-s ours) am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev

* commit 'cc828be1e1df500e878aff950ccf2a3cfeef786c':

9 years agoam 4e042473: am 393a27c8: (-s ours) am 1d7c3254: Merge "Correctly propagate permissio...
Jeff Davidson [Thu, 27 Aug 2015 19:38:55 +0000 (19:38 +0000)]
am 4e042473: am 393a27c8: (-s ours) am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev

* commit '4e0424734b03dc6852c0b026e7a80e19bc325a4b':