OSDN Git Service

android-x86/frameworks-base.git
8 years agoam da5f10f4: (-s ours) am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio...
Rich Sloager [Thu, 27 Aug 2015 10:31:54 +0000 (10:31 +0000)]
am da5f10f4: (-s ours) am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs

* commit 'da5f10f41fa3d2c5dc01c165946c27df986f2178':

8 years agoam b614a7d9: (-s ours) am 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio...
Rich Sloager [Thu, 27 Aug 2015 10:31:42 +0000 (10:31 +0000)]
am b614a7d9: (-s ours) am 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs

* commit 'b614a7d9042e8edb9c80dad4bafcd10c23555d8c':

8 years agoam b6f0aefc: (-s ours) am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio...
Rich Sloager [Thu, 27 Aug 2015 10:31:30 +0000 (10:31 +0000)]
am b6f0aefc: (-s ours) am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs

* commit 'b6f0aefcfd004bbbf2d743180255904df0a85477':

8 years agoam f2685d69: (-s ours) am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio...
Rich Sloager [Thu, 27 Aug 2015 10:31:19 +0000 (10:31 +0000)]
am f2685d69: (-s ours) am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs

* commit 'f2685d69bb9844b80f7964de2d1c582ce7e46f80':

8 years agoam 83c7d168: (-s ours) am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio...
Rich Sloager [Thu, 27 Aug 2015 10:31:01 +0000 (10:31 +0000)]
am 83c7d168: (-s ours) am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs

* commit '83c7d1689b6bcddd857770e7b4809c843b09ad76':

8 years agoam ee68db53: (-s ours) am 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support...
Rich Slogar [Thu, 27 Aug 2015 10:30:41 +0000 (10:30 +0000)]
am ee68db53: (-s ours) am 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions

* commit 'ee68db5389317902d8a27ccd43b2d5505b5c5093':

8 years agoam 24eabe83: (-s ours) am 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated...
Andrew Solovay [Thu, 27 Aug 2015 10:30:27 +0000 (10:30 +0000)]
am 24eabe83: (-s ours) am 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs

* commit '24eabe831a39a32831803f36eb0ccee690bfd177':

8 years agoam acbb1a96: (-s ours) am 5d467ac5: Merge "Remove uids with empty history from Networ...
Esteban Talavera [Thu, 27 Aug 2015 10:30:14 +0000 (10:30 +0000)]
am acbb1a96: (-s ours) am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev

* commit 'acbb1a96348f3abd4520773c27ebebc5a6a40c30':

8 years agoam 91ca3d71: (-s ours) am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev
Chris Banes [Thu, 27 Aug 2015 10:29:55 +0000 (10:29 +0000)]
am 91ca3d71: (-s ours) am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev

* commit '91ca3d71d8f5d516c8620b76b46e15c9f7dcdfbd':

8 years agoam a67a3924: (-s ours) am 70004d9f: docs: fix build errors due to linked apache http...
Joe Fernandez [Thu, 27 Aug 2015 10:29:44 +0000 (10:29 +0000)]
am a67a3924: (-s ours) am 70004d9f: docs: fix build errors due to linked apache http classes

* commit 'a67a39244cb7982b699b04d6641fac269ccd1142':

8 years agoam 770a8b4f: (-s ours) am 28f2ba8e: docs: Remove Google Play Services pages under...
Quddus Chong [Thu, 27 Aug 2015 10:29:24 +0000 (10:29 +0000)]
am 770a8b4f: (-s ours) am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services.

* commit '770a8b4f1c61ecd5ee4c74a1880592c5e36020da':

8 years agoam 2cfba6dc: (-s ours) am 85429c0d: docs: Android 5.1 API Release notes (Lollipop...
Joe Fernandez [Thu, 27 Aug 2015 10:29:11 +0000 (10:29 +0000)]
am 2cfba6dc: (-s ours) am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1)

* commit '2cfba6dc284a794ac9789a635c04ff499250c7d9':

8 years agoam c4876464: (-s ours) am 637db47e: docs: SDK Tools v23.3.4 release download links
Joe Fernandez [Thu, 27 Aug 2015 10:29:00 +0000 (10:29 +0000)]
am c4876464: (-s ours) am 637db47e: docs: SDK Tools v23.3.4 release download links

* commit 'c4876464a9f76f9eb8ecf22cce36b2f9f7e3c6f2':

8 years agoam e6b2a1e9: (-s ours) am 0baf95bf: docs: SDK Tools Release notes for v24.3.4
Joe Fernandez [Thu, 27 Aug 2015 10:28:40 +0000 (10:28 +0000)]
am e6b2a1e9: (-s ours) am 0baf95bf: docs: SDK Tools Release notes for v24.3.4

* commit 'e6b2a1e9f0416f699908f9f3943c15c34ad8e42d':

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

* commit '882c34d23999670dd7ceecbe67a446025f70ad2e':

8 years agoam 83b1ad4a: (-s ours) am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes...
Joe Fernandez [Thu, 27 Aug 2015 10:28:17 +0000 (10:28 +0000)]
am 83b1ad4a: (-s ours) am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev

* commit '83b1ad4a21a678b1251ff141681aae9ef7c220bd':

8 years agoam a6262543: (-s ours) am bd4ed32f: docs: Preview 3 - Support page updates
Joe Fernandez [Thu, 27 Aug 2015 10:28:01 +0000 (10:28 +0000)]
am a6262543: (-s ours) am bd4ed32f: docs: Preview 3 - Support page updates

* commit 'a6262543828e343cfeb69ad2ab07e109470e09d2':

8 years agoam ae6771e9: (-s ours) am 42c22d04: Merge "Doc change: Edits for final SDK and dev...
Dirk Dougherty [Thu, 27 Aug 2015 10:27:51 +0000 (10:27 +0000)]
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 'ae6771e9c3b822eef9184d94d5786b265feacc05':

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

* commit 'fdcd2637eb09b5f4430930e3ac865b3960fd44a1':

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

* commit 'bee84879a90b73d1ccd59771fce19e9653cda071':

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

* commit '293b85ba821affb4fb464324c8599e714bb42aed':
  Fix pessimizing move.

8 years agoam c964884e: (-s ours) am 1017f986: Merge "Camera2: Add camera type to getNumberOfCam...
Eino-Ville Talvala [Thu, 27 Aug 2015 10:26:59 +0000 (10:26 +0000)]
am c964884e: (-s ours) am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

* commit 'c964884eb73cd1c903809bfa3393fbf51f38a133':

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

* commit 'b22f33e8fa07f10565515b301e60f99ea19e8b46':

8 years agoam 398eeaaa: (-s ours) am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev
Joe Fernandez [Thu, 27 Aug 2015 10:26:38 +0000 (10:26 +0000)]
am 398eeaaa: (-s ours) am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev

* commit '398eeaaaa6c693578349da1efd638e38a15b6132':

8 years agoam d2acabba: (-s ours) am 886e382d: Merge "docs: Added Javadoc links for new M Previe...
Andrew Solovay [Thu, 27 Aug 2015 10:26:28 +0000 (10:26 +0000)]
am d2acabba: (-s ours) am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev

* commit 'd2acabba35548495f1e16207b9ddc05c9eea4573':

8 years agoam c973ebac: (-s ours) am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Stand...
David Friedman [Thu, 27 Aug 2015 10:26:19 +0000 (10:26 +0000)]
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 'c973ebac36668707f6cec3f60bcd08e615a41241':

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

* commit '090341d7e0b9147f05b29edb110bc6d35937e970':

8 years agoam b774ed20: (-s ours) am 06f552cf: Merge "Add debugging for issue #23190084: [APPCom...
Dianne Hackborn [Thu, 27 Aug 2015 10:26:01 +0000 (10:26 +0000)]
am b774ed20: (-s ours) am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev

* commit 'b774ed20ec809cfb66a5e4cc43c452e8b43a9939':

8 years agoam 3ed2a4e1: (-s ours) am eee09f49: Merge "cherrypick from mnc-preview-docs docs...
Andrew Solovay [Thu, 27 Aug 2015 10:25:52 +0000 (10:25 +0000)]
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 '3ed2a4e169cb5d676e768015216bf7f98db37e2f':

8 years agoam f13f1efa: (-s ours) am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."
Dan Albert [Thu, 27 Aug 2015 10:25:38 +0000 (10:25 +0000)]
am f13f1efa: (-s ours) am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."

* commit 'f13f1efab233b5b90c185b973665e5b675a6de53':

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

* commit '9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb':

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

* commit '930fa6d6f640452ff57986587e5e37f49d49fd4e':

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

* commit '72c982fa247100e845f1ebe1f8b59eae84e9e504':

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

* commit 'fa42d28f60095d49ef4361c1b21b0e970332e2b9':

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

* commit '4fe0a44658461cd35df0f85f03bea1c6ee1e9d37':

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

* commit '9eec1c2aa5353f0ec6001cf40632faf50f40ea55':

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

* commit '2f160d38c02275150864afaf2649949a00234209':

8 years agoam d7a164bf: (-s ours) am 7e7d79ef: Merge "Make "Ask every time" actually work that...
Chris Tate [Thu, 27 Aug 2015 10:23:59 +0000 (10:23 +0000)]
am d7a164bf: (-s ours) am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit 'd7a164bf3ff67a9c37e9879c333e79aacc991e1b':

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

* commit '3ffc0f1e81f6a45190cd928759e728ecbdfaf0b9':

8 years agoam 03e64e4e: (-s ours) am b045331f: Merge "Add GTS test to ensure valid default permi...
Svetoslav Ganov [Thu, 27 Aug 2015 10:23:39 +0000 (10:23 +0000)]
am 03e64e4e: (-s ours) am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

* commit '03e64e4edd8fc32fa04a4ca8dfc3184129281a55':

8 years agoam b53738f7: (-s ours) am cfcf6af9: Merge "Method to show DialogFragment allowing...
Jeff Sharkey [Thu, 27 Aug 2015 10:23:29 +0000 (10:23 +0000)]
am b53738f7: (-s ours) am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev

* commit 'b53738f71e80760394df1825ee94a60ce9dcca4b':

8 years agoam 619bbdf4: (-s ours) am 37dd5240: Merge "Doc change: Update preview pages for dp3...
Joe Fernandez [Thu, 27 Aug 2015 10:23:20 +0000 (10:23 +0000)]
am 619bbdf4: (-s ours) am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev

* commit '619bbdf4a9b22294be8b0a685e1f41b4a10a7127':

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

* commit '8de9d4458347a00333a340e1400a0ef0fe7da9ab':

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

* commit 'c245093f96856c702779d741e7043b847cdc4c22':

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

* commit '9f65f0a2c00871fd5fa74e241d46ca65a7d3b40f':

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

* commit '93eef42349133b5857f538f4ea6278ba561fd536':

8 years agoam 692e9b34: (-s ours) am 90460c79: Merge "Add more intelligence to bluetooth connect...
Jason Monk [Thu, 27 Aug 2015 10:22:17 +0000 (10:22 +0000)]
am 692e9b34: (-s ours) am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev

* commit '692e9b3404a2ba2260fa50668fbbc76d8c874f21':

8 years agoam 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
Bart Sears [Thu, 27 Aug 2015 10:22:02 +0000 (10:22 +0000)]
am 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

* commit '48ce6d27015fa40291ed1aa4fcf414c3cb6fa818':

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

* commit '6d52d7616d339801af6caad77bc50df16df7a813':

8 years agoam 25919834: (-s ours) am c97509c0: Merge "Update ifaces when global restriction...
Jeff Sharkey [Thu, 27 Aug 2015 10:21:33 +0000 (10:21 +0000)]
am 25919834: (-s ours) am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev

* commit '259198343bce24500d4abbf063ea579772b5ebb9':

8 years agoam 715bb2f6: (-s ours) am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver...
Nick Kralevich [Thu, 27 Aug 2015 10:21:18 +0000 (10:21 +0000)]
am 715bb2f6: (-s ours) am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin."

* commit '715bb2f64b22e81e65c0f2dfe47fb8afd9afe3d4':

8 years agoam 3255e2f9: (-s ours) Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp
Andreas Gampe [Thu, 27 Aug 2015 10:21:09 +0000 (10:21 +0000)]
am 3255e2f9: (-s ours) Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp

* commit '3255e2f961a005033dd761982fcd06697441bc05':
  Hwui: Remove unused variables

8 years agoam 17b4be07: (-s ours) am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from...
Elliott Hughes [Thu, 27 Aug 2015 10:21:01 +0000 (10:21 +0000)]
am 17b4be07: (-s ours) am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."

* commit '17b4be07fed91da2f770be87f66b1e8918dff52f':

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

* commit '9dc2d5cd5bcd7519537828794a77a45d0a14ea03':

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

* commit '09c62671e9d64ad7e3c36c3265c650b3b03b3822':

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

* commit 'fdc169c1b065d3306347407657964aeb043c47d3':

8 years agoam 44a80e20: (-s ours) am c0a4883d: Merge "Prevent overlap of color views in landscap...
Adrian Roos [Thu, 27 Aug 2015 10:20:29 +0000 (10:20 +0000)]
am 44a80e20: (-s ours) am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev

* commit '44a80e2013022dea9d7e8bec21f095a19cb6131a':

8 years agoam fab69aaa: (-s ours) am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev
Jason Monk [Thu, 27 Aug 2015 10:20:22 +0000 (10:20 +0000)]
am fab69aaa: (-s ours) am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev

* commit 'fab69aaa943bd844f7393aeec4cd0481392835db':

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

* commit 'c1372049d7a6f6ce51bc70a15eb459015e4b0bca':

8 years agoam b56511a7: (-s ours) am 24e4d48f: Merge "Promote system app permissions" into mnc-dev
Todd Kennedy [Thu, 27 Aug 2015 10:20:05 +0000 (10:20 +0000)]
am b56511a7: (-s ours) am 24e4d48f: Merge "Promote system app permissions" into mnc-dev

* commit 'b56511a7d9c3fbada9a9f522904fb75c958a6738':

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

* commit '782fd14764ff9e579d4473be204843c48895c07c':

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

* commit 'd29382aaf0dc68eb5a41621fedabeca4406efe06':

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

* commit 'd03c38e7041759dda3c11fc26c691661cfbe8e8b':

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

* commit '6ceed53eeb6d14bb5dbf1f5ae719ad2722de9fb5':

8 years agoam 47c5338b: (-s ours) am 968fc3ab: Merge "Fix deadlock." into mnc-dev
Carlos Valdivia [Thu, 27 Aug 2015 10:18:56 +0000 (10:18 +0000)]
am 47c5338b: (-s ours) am 968fc3ab: Merge "Fix deadlock." into mnc-dev

* commit '47c5338bc33b69ecbe4cfd719735112ef30f0521':

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

* commit 'c787d8bc1343aeee44b65ea632bb107bd20c2238':

8 years agoam 6c55ec30: (-s ours) am 59123b9b: Merge "When closing task stack remove reference...
Filip Gruszczynski [Thu, 27 Aug 2015 10:18:38 +0000 (10:18 +0000)]
am 6c55ec30: (-s ours) am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev

* commit '6c55ec301531844089ebcf696b1259ae7282e116':

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

* commit '75a3f8f1d27a9281b229193c9c267f03cbcc4c9d':

8 years agoam b2a979a3: (-s ours) am e43d43c3: Merge "Fixed issue with moveTaskToBack on single...
Wale Ogunwale [Thu, 27 Aug 2015 10:18:21 +0000 (10:18 +0000)]
am b2a979a3: (-s ours) am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev

* commit 'b2a979a3b7033dd3cfd868c80e409026baf52d7e':

8 years agoam bb5b3ca2: (-s ours) am 494d6e9b: [fingerprint] use credential owner in Fingerprint...
Andres Morales [Thu, 27 Aug 2015 10:18:13 +0000 (10:18 +0000)]
am bb5b3ca2: (-s ours) am 494d6e9b: [fingerprint] use credential owner in FingerprintService

* commit 'bb5b3ca25080ba3c7fd4a3942646efb15265e441':

8 years agoam a01479f5: (-s ours) am 8851608d: Merge "Always call onProvidersChanged() when...
Winson Chung [Thu, 27 Aug 2015 10:18:05 +0000 (10:18 +0000)]
am a01479f5: (-s ours) am 8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev

* commit 'a01479f51513f35a07c555f61970b1155eac0f7e':

8 years agoam 3080ceb1: (-s ours) am 19aa341a: Merge "Save data registration roaming state"...
Chris Manton [Thu, 27 Aug 2015 10:17:56 +0000 (10:17 +0000)]
am 3080ceb1: (-s ours) am 19aa341a: Merge "Save data registration roaming state" into mnc-dev

* commit '3080ceb18cd215eb731575136be6716607f2dc6d':

8 years agoam 0dcad221: (-s ours) am 7d85b543: Merge "Make DelegateManager thread safe" into...
Diego Perez [Thu, 27 Aug 2015 10:17:44 +0000 (10:17 +0000)]
am 0dcad221: (-s ours) am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev

* commit '0dcad221f1bd2852a18a672a7722bbfa50918aca':

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

* commit 'd764de105d43dc0b6ce26dcc9208684b330b2fc1':

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

* commit 'db0af5261f15eecff7ca3538591c96885aa494fc':

8 years agoam 3288e632: (-s ours) am b4eb0640: Merge "Avoid use-after-free race condition when...
Alan Viverette [Thu, 27 Aug 2015 10:16:57 +0000 (10:16 +0000)]
am 3288e632: (-s ours) am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev

* commit '3288e632501e30b10786f377be07f8a3f343cad3':

8 years agoam f18a0cfe: (-s ours) am ad7719de: Merge "Crash apps with bad notification icons...
Daniel Sandler [Thu, 27 Aug 2015 10:16:36 +0000 (10:16 +0000)]
am f18a0cfe: (-s ours) am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev

* commit 'f18a0cfe13f5fa920be966d1bfc30ec2d37c3257':

8 years agoam 9e08ac0d: (-s ours) am 4dbb37ae: Merge "Update setApplicationRestrictions document...
Esteban Talavera [Thu, 27 Aug 2015 10:16:16 +0000 (10:16 +0000)]
am 9e08ac0d: (-s ours) am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev

* commit '9e08ac0d74c955ef7a0bea5fd61ac00a5e465419':

8 years agoam af7855ff: (-s ours) am b08c24a3: Frameworks/base: Disable Clang in core/jni
Andreas Gampe [Thu, 27 Aug 2015 10:15:56 +0000 (10:15 +0000)]
am af7855ff: (-s ours) am b08c24a3: Frameworks/base: Disable Clang in core/jni

* commit 'af7855ff854b8112ed3598c4686187bb643e9d53':

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

* commit '85aed84e25a7f07cc229efa1749e2bd4f95d184b':

8 years agoam b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messa...
Jorim Jaggi [Thu, 27 Aug 2015 10:15:14 +0000 (10:15 +0000)]
am b2e34d36: (-s ours) am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev

* commit 'b2e34d3637d6edd03bb7ce45a7f84a27bc101f9c':

8 years agoam 919e7cad: (-s ours) am b2b02092: Merge "Fix issue #23037899: Support for Battery...
Dianne Hackborn [Thu, 27 Aug 2015 10:14:59 +0000 (10:14 +0000)]
am 919e7cad: (-s ours) am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev

* commit '919e7cad274ebb9f85a31c597bfbe0416d60cd58':

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

* commit '48d58aad651b1c99c6d6e430142941e76fc06d37':

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

* commit '2403e51c2fba387c147e4e9a48eaa671edd4b086':

8 years agoam cb312965: (-s ours) am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission...
Simranjit Kohli [Thu, 27 Aug 2015 10:14:24 +0000 (10:14 +0000)]
am cb312965: (-s ours) am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev

* commit 'cb3129656da216179211a1204c51499daf06e2d3':

8 years agoam 081905c5: (-s ours) am c5283927: Close ZipFiles correctly in WebViewFactory.
Torne (Richard Coles) [Thu, 27 Aug 2015 10:14:12 +0000 (10:14 +0000)]
am 081905c5: (-s ours) am c5283927: Close ZipFiles correctly in WebViewFactory.

* commit '081905c5826fb72c9a19aaead6797029b0fea436':

8 years agoam eda0838f: (-s ours) am 4218e46a: Merge "Initialize network name better in NetworkC...
Jason Monk [Thu, 27 Aug 2015 10:13:57 +0000 (10:13 +0000)]
am eda0838f: (-s ours) am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev

* commit 'eda0838faa27d514334169f53b136f73fccab524':

8 years agoam 624037df: (-s ours) am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devic...
Paul Mclean [Thu, 27 Aug 2015 10:13:40 +0000 (10:13 +0000)]
am 624037df: (-s ours) am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev

* commit '624037df1521398592471531951b1b89cbf4d686':

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

* commit 'ef23eb24d5f7c3cc62b46dc01b6545a6b7fdbf2a':

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

* commit '8a23ad62c5fc9b2df63bf5266109a6c85254b591':

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

* commit '416605e450b4caa6988ea6feeae89305a1e822fb':

8 years agoam 199edc5c: (-s ours) am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE...
Billy Lau [Thu, 27 Aug 2015 10:12:13 +0000 (10:12 +0000)]
am 199edc5c: (-s ours) am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '199edc5ca66cdecca4f9d53953da48c60d41d988':

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

* commit '10faec4bc054536b4cce7c8cbc8faa367c397efe':

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

* commit '6dc2ac39e5913ceb5348d2e1e41af0ac95f59592':

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

* commit 'cf9b82518cc9f5d232a3b460dd8348d42b3132e8':

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

* commit '1451df28162978ac0609690357d8f0d9e1635c16':

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

* commit 'd63cb3377405861632d8a0fac758d301b286b11b':

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

* commit '936d2022e1933c9b9932b55fdd8c0dcbff42da48':

8 years agoam 59769181: (-s ours) am 69ed3308: Merge "Allow system to disable lockscreen" into...
Jason Monk [Thu, 27 Aug 2015 10:10:10 +0000 (10:10 +0000)]
am 59769181: (-s ours) am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev

* commit '59769181a52cd7dc2da12ef324c6a2336540d627':

8 years agoam d512325a: (-s ours) am 1fbc1b3b: Merge "Fix partial user cleanup on restart" into...
Amith Yamasani [Thu, 27 Aug 2015 10:09:51 +0000 (10:09 +0000)]
am d512325a: (-s ours) am 1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev

* commit 'd512325aaa89b03d7f0fccebb7d093324d95257d':