OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 48090be8: (-s ours) am bbce221e: Merge "Fallback to Cellular if WiFi fails to...
Paul Jensen [Thu, 27 Aug 2015 07:03:36 +0000 (07:03 +0000)]
am 48090be8: (-s ours) am bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev

* commit '48090be81a594b167266ddf14c8b50d41a8a0abd':

9 years agoam 5721226e: (-s ours) am d8cdba0d: Merge "Prepare some ConnectivityService logic...
Paul Jensen [Thu, 27 Aug 2015 07:03:23 +0000 (07:03 +0000)]
am 5721226e: (-s ours) am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev

* commit '5721226e3ed5f7b40ac3a43a9e5a71bb2f87de01':

9 years agoam 9c2df94f: (-s ours) am 00c64f7c: Merge "Add android.net.CaptivePortal class for...
Paul Jensen [Thu, 27 Aug 2015 07:02:58 +0000 (07:02 +0000)]
am 9c2df94f: (-s ours) am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev

* commit '9c2df94fbcd764e9fd9ee48cec614d47821b4464':

9 years agoam 6ff93d48: (-s ours) am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI...
Tom Hudson [Thu, 27 Aug 2015 07:02:20 +0000 (07:02 +0000)]
am 6ff93d48: (-s ours) am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev

* commit '6ff93d486ca383331b69320c2d6a09e395c65367':

9 years agoam c42b5ef1: (-s ours) am 0236e6b2: Fix the build.
Bart Sears [Thu, 27 Aug 2015 07:02:06 +0000 (07:02 +0000)]
am c42b5ef1: (-s ours) am 0236e6b2: Fix the build.

* commit 'c42b5ef190a11d52387f4ebea979fc7f91fb35ac':

9 years agoam 04745480: (-s ours) am 664251a2: Merge "Fix build" into mnc-dev
Svetoslav [Thu, 27 Aug 2015 07:01:55 +0000 (07:01 +0000)]
am 04745480: (-s ours) am 664251a2: Merge "Fix build" into mnc-dev

* commit '047454803997a8709f2ca17ff8ebd6fcf038500b':

9 years agoam b7508fc1: (-s ours) am 1aa40492: Merge "Revert "Security: AccountChooser shouldn...
Bart Sears [Thu, 27 Aug 2015 07:01:46 +0000 (07:01 +0000)]
am b7508fc1: (-s ours) am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev

* commit 'b7508fc159901617b5f07772b548839552bebf10':

9 years agoam aebf04e5: (-s ours) am a2cd9c56: Merge "Camera2: Reorganize high-speed recording...
Eino-Ville Talvala [Thu, 27 Aug 2015 07:01:39 +0000 (07:01 +0000)]
am aebf04e5: (-s ours) am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev

* commit 'aebf04e5dfaa649874763c486a18eb7957f2dcdc':

9 years agoam 4714c492: (-s ours) am becb4164: am a70109e4: am 019a0943: Docs: Fixes a typo.
David Friedman [Thu, 27 Aug 2015 07:01:30 +0000 (07:01 +0000)]
am 4714c492: (-s ours) am becb4164: am a70109e4: am 019a0943: Docs: Fixes a typo.

* commit '4714c49225eec6789782c19ab6b9773b0db97542':

9 years agoam df6a1155: (-s ours) am d75391e0: am 8d56096b: am f739ad7f: Fix typos in preview...
Dirk Dougherty [Thu, 27 Aug 2015 07:01:15 +0000 (07:01 +0000)]
am df6a1155: (-s ours) am d75391e0: am 8d56096b: am f739ad7f: Fix typos in preview support.

* commit 'df6a11556454f146cb678c8305db729fdea9ce33':

9 years agoam 5e424a98: (-s ours) am 319883c8: Merge "Security: AccountChooser shouldn\'t auto...
Carlos Valdivia [Thu, 27 Aug 2015 07:00:31 +0000 (07:00 +0000)]
am 5e424a98: (-s ours) am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev

* commit '5e424a9854c18047ff445604ff0df75f27b32158':

9 years agoam 2ffde8ff: (-s ours) am 83e9525c: Merge "Fix premature clearing of clearable sysui...
Adrian Roos [Thu, 27 Aug 2015 06:59:21 +0000 (06:59 +0000)]
am 2ffde8ff: (-s ours) am 83e9525c: Merge "Fix premature clearing of clearable sysui flags" into mnc-dev

* commit '2ffde8ff80c75e18c64b048e92809392b29e0fb2':

9 years agoam 40d23c1a: (-s ours) am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
Dianne Hackborn [Thu, 27 Aug 2015 06:58:23 +0000 (06:58 +0000)]
am 40d23c1a: (-s ours) am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev

* commit '40d23c1a266125ee17132ab8a6b341ea8efcf6b7':

9 years agoam 2a018b01: (-s ours) am 6ed4b9df: Merge "Deep-copying sucks when all you want is...
John Reck [Thu, 27 Aug 2015 06:57:52 +0000 (06:57 +0000)]
am 2a018b01: (-s ours) am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev

* commit '2a018b01af0c4cd18c8ce8a6cdf63c120604d9a2':

9 years agoam c2d0d090: (-s ours) am b7ba1220: Teach ImageView to recycle internal drawables
John Reck [Thu, 27 Aug 2015 06:57:27 +0000 (06:57 +0000)]
am c2d0d090: (-s ours) am b7ba1220: Teach ImageView to recycle internal drawables

* commit 'c2d0d09015d440978d2638da96787fad6634704e':

9 years agoam 1d8cf531: (-s ours) am 171fe6ac: Merge "Add an API for apps to query if a permisis...
Svet Ganov [Thu, 27 Aug 2015 06:56:48 +0000 (06:56 +0000)]
am 1d8cf531: (-s ours) am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev

* commit '1d8cf5316ccb6faf1e94b42ef4060c24be54ac06':

9 years agoam 75bcfeab: (-s ours) am 4ee9b23a: Merge "Delete dead code" into mnc-dev
John Reck [Thu, 27 Aug 2015 06:56:03 +0000 (06:56 +0000)]
am 75bcfeab: (-s ours) am 4ee9b23a: Merge "Delete dead code" into mnc-dev

* commit '75bcfeabb982d4fcddff12664ecf761e5d3c6e97':

9 years agoam 172d48cf: (-s ours) am 4d8134c1: Merge "Fix black keyguard / missing status bar...
Adrian Roos [Thu, 27 Aug 2015 06:55:04 +0000 (06:55 +0000)]
am 172d48cf: (-s ours) am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev

* commit '172d48cf87e62aa378cd20766f452b2acdb197fa':

9 years agoam ea0b945b: (-s ours) am d80cf910: Merge "Allow codepath changes for new OTA package...
Todd Kennedy [Thu, 27 Aug 2015 06:54:08 +0000 (06:54 +0000)]
am ea0b945b: (-s ours) am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev

* commit 'ea0b945b7313cd33fb0eac0687c0cc1da78bd59b':

9 years agoam cc964850: (-s ours) am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issue...
Dianne Hackborn [Thu, 27 Aug 2015 06:53:41 +0000 (06:53 +0000)]
am cc964850: (-s ours) am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev

* commit 'cc9648500c2d528c0bfe488ab7b5a5e0fd3cd66e':

9 years agoam 9be2a462: (-s ours) am a1790304: Do not return devices when caller has no location...
Fyodor Kupolov [Thu, 27 Aug 2015 06:53:05 +0000 (06:53 +0000)]
am 9be2a462: (-s ours) am a1790304: Do not return devices when caller has no location permission

* commit '9be2a462c829dfb09bca837c07d1197a1db6e9e0':

9 years agoam e41a21e1: (-s ours) am adebbeba: Merge "Remote extraneous debugging log message...
Christopher Tate [Thu, 27 Aug 2015 06:52:24 +0000 (06:52 +0000)]
am e41a21e1: (-s ours) am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev

* commit 'e41a21e1c288a9a16c56178253993d51f5c74516':

9 years agoam bea4eaf5: (-s ours) am 2a67840c: Fix a bad merge.
Jeff Brown [Thu, 27 Aug 2015 06:52:01 +0000 (06:52 +0000)]
am bea4eaf5: (-s ours) am 2a67840c: Fix a bad merge.

* commit 'bea4eaf567ec2b523529c6c360d2f1b127c78f57':

9 years agoam cb23b7e8: (-s ours) am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into...
Jeff Brown [Thu, 27 Aug 2015 06:51:35 +0000 (06:51 +0000)]
am cb23b7e8: (-s ours) am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev

* commit 'cb23b7e89b7222a9593d0b1d93fc0e0fd7b3a415':

9 years agoam 021ee214: (-s ours) am 968f9fdf: Merge "Slightly more precise RTL check in BoringL...
Raph Levien [Thu, 27 Aug 2015 06:51:17 +0000 (06:51 +0000)]
am 021ee214: (-s ours) am 968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev

* commit '021ee214c17fce863127eafad44029ff925493e8':

9 years agoam 736249d1: (-s ours) am 3cc5c24b: Merge "Fix assist for hardware long-press" into...
Jorim Jaggi [Thu, 27 Aug 2015 06:50:56 +0000 (06:50 +0000)]
am 736249d1: (-s ours) am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev

* commit '736249d1bcc93e02ed92c8054dc1b5387ad7a944':

9 years agoam 22d4a8b2: (-s ours) am 279678e1: Merge "Show a default icon for permissions that...
Julia Reynolds [Thu, 27 Aug 2015 06:50:27 +0000 (06:50 +0000)]
am 22d4a8b2: (-s ours) am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev

* commit '22d4a8b2ddc15ebb8acfd21ea84b98097d1f8c09':

9 years agoam ddcfb5d0: (-s ours) am 58599104: Merge "Remove data icon for WFC" into mnc-dev
Jason Monk [Thu, 27 Aug 2015 06:49:56 +0000 (06:49 +0000)]
am ddcfb5d0: (-s ours) am 58599104: Merge "Remove data icon for WFC" into mnc-dev

* commit 'ddcfb5d0a4aa25598dbee5f95d260d80f965b454':

9 years agoam 89928030: (-s ours) am 8969817a: Merge "Fix roaming icon when not default signal...
Jason Monk [Thu, 27 Aug 2015 06:49:32 +0000 (06:49 +0000)]
am 89928030: (-s ours) am 8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev

* commit '89928030b519cb82dc6328aa52d3d31dda740582':

9 years agoam e437b1a9: (-s ours) am 5d21f416: Merge "Dispatch onUserSwitched callbacks on handl...
Amith Yamasani [Thu, 27 Aug 2015 06:49:14 +0000 (06:49 +0000)]
am e437b1a9: (-s ours) am 5d21f416: Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev

* commit 'e437b1a9ff497fa650c7979149b072fb6357c25a':

9 years agoam 4d51987c: (-s ours) am f17d77cd: am 43a2aca4: Merge "Remove @ToBeFixed from knownt...
Narayan Kamath [Thu, 27 Aug 2015 06:48:57 +0000 (06:48 +0000)]
am 4d51987c: (-s ours) am f17d77cd: am 43a2aca4: Merge "Remove @ToBeFixed from knowntags."

* commit '4d51987c19267cdf313b9381271ee0a8c0e0c154':

9 years agoam 14200f8a: (-s ours) am 607a040d: Merge "Add a mechanism for products to specify...
Christopher Tate [Thu, 27 Aug 2015 06:48:38 +0000 (06:48 +0000)]
am 14200f8a: (-s ours) am 607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev

* commit '14200f8af2924c441803319e6937fdcf7ecd4ffb':

9 years agoam 18c1c358: (-s ours) am 322fd93f: Merge "Add missing break in AccessibilityEvent...
Alan Viverette [Thu, 27 Aug 2015 06:48:22 +0000 (06:48 +0000)]
am 18c1c358: (-s ours) am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev

* commit '18c1c358c5f04b6763a5d9aad6eee46605e4b32f':

9 years agoam ebf2ccb9: (-s ours) am 3f511882: Merge "Check location permission/appop in getScan...
Fyodor Kupolov [Thu, 27 Aug 2015 06:47:57 +0000 (06:47 +0000)]
am ebf2ccb9: (-s ours) am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev

* commit 'ebf2ccb98ce4154d927d5c7e0448a512879346e3':

9 years agoam 716e95d0: (-s ours) am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state...
Robert Greenwalt [Thu, 27 Aug 2015 06:47:19 +0000 (06:47 +0000)]
am 716e95d0: (-s ours) am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev

* commit '716e95d06d57ec6f640c6436f6903c245d18c5b5':

9 years agoam f09116f8: (-s ours) am ee4a534b: Merge "Timeout when partitioning takes too long...
Jeff Sharkey [Thu, 27 Aug 2015 06:46:39 +0000 (06:46 +0000)]
am f09116f8: (-s ours) am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev

* commit 'f09116f84ee9c11c97df479388cbfbccd8af9a17':

9 years agoam 2b748765: (-s ours) am a419076e: Merge "Add grant flag support to "install-create...
Jeff Sharkey [Thu, 27 Aug 2015 06:46:29 +0000 (06:46 +0000)]
am 2b748765: (-s ours) am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev

* commit '2b74876562232fcd04cf8acbc6d99b90f8284b1a':

9 years agoam 046daf12: (-s ours) am abb8dc97: Merge "Enhance documentation of WebSettings.WebSe...
Mikhail Naganov [Thu, 27 Aug 2015 06:46:21 +0000 (06:46 +0000)]
am 046daf12: (-s ours) am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev

* commit '046daf121cee3aebfa54c21eb13ba49ccb5dd017':

9 years agoam a90b9aaf: (-s ours) am b27c379b: am 2ca4f73e: Merge "Switch LocalSocketImpl.accept...
Neil Fuller [Thu, 27 Aug 2015 06:46:13 +0000 (06:46 +0000)]
am a90b9aaf: (-s ours) am b27c379b: am 2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"

* commit 'a90b9aaf56182e93ef180145d279810f7ee03d7f':

9 years agoam cdb4a2c4: (-s ours) am 30d75e60: am c83d1819: Merge "Switch from InetUnixAddress...
Neil Fuller [Thu, 27 Aug 2015 06:46:05 +0000 (06:46 +0000)]
am cdb4a2c4: (-s ours) am 30d75e60: am c83d1819: Merge "Switch from InetUnixAddress to UnixSocketAddress"

* commit 'cdb4a2c4c250bb06f0dfa494a11b8ddee2f749d7':

9 years agoam 937fc8d4: (-s ours) am 7d170797: Merge "Mute correct user from device policy manag...
Kenny Guy [Thu, 27 Aug 2015 06:45:56 +0000 (06:45 +0000)]
am 937fc8d4: (-s ours) am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev

* commit '937fc8d4dc6d27d92adf141f5dc57faa59f28034':

9 years agoam 970d2a09: (-s ours) am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
Narayan Kamath [Thu, 27 Aug 2015 06:45:47 +0000 (06:45 +0000)]
am 970d2a09: (-s ours) am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.

* commit '970d2a09ded099c8f9e48f5f1fcd13ac7b4945fe':

9 years agoam 4cb773a8: (-s ours) am 8cb9fd84: am 6051cd3e: am 1809f534: Docs: Changes to the...
David Friedman [Thu, 27 Aug 2015 06:45:29 +0000 (06:45 +0000)]
am 4cb773a8: (-s ours) am 8cb9fd84: am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.

* commit '4cb773a8c044f68de684efc0b009f503b477168b':

9 years agoam 303dd9a2: (-s ours) am 872c2482: am 95fc4f45: am 9d5df5ca: Merge "Doc change:...
Dirk Dougherty [Thu, 27 Aug 2015 06:45:02 +0000 (06:45 +0000)]
am 303dd9a2: (-s ours) am 872c2482: am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs

* commit '303dd9a2d89555b556603033560081d050f139cb':

9 years agoam 49cd4eac: (-s ours) am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes...
David Friedman [Thu, 27 Aug 2015 06:44:38 +0000 (06:44 +0000)]
am 49cd4eac: (-s ours) am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs

* commit '49cd4eac3b6af25f82ceebfe73666df4d2ddcc14':

9 years agoam e075053b: (-s ours) am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change:...
Dirk Dougherty [Thu, 27 Aug 2015 06:44:23 +0000 (06:44 +0000)]
am e075053b: (-s ours) am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs

* commit 'e075053b0842c21c93a031fbeeecc6fe3882e11d':

9 years agoam d92f643a: (-s ours) am 748bc36f: Remove "final" qualifier from AuthenticationResult
Jim Miller [Thu, 27 Aug 2015 06:44:15 +0000 (06:44 +0000)]
am d92f643a: (-s ours) am 748bc36f: Remove "final" qualifier from AuthenticationResult

* commit 'd92f643a726e1abcc46cfb34d7cdd7a45853b7e7':

9 years agoam e9402b7e: (-s ours) am 348988c5: Merge "Fix permissions on TelephonyManager" into...
Robert Greenwalt [Thu, 27 Aug 2015 06:44:03 +0000 (06:44 +0000)]
am e9402b7e: (-s ours) am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev

* commit 'e9402b7e5bca1b0e1d2c8b7945ed67a0292a47c1':

9 years agoam bae7a4d8: (-s ours) am 58295e71: Merge "Add Null checks while processing pairing...
Sanket Padawe [Thu, 27 Aug 2015 06:43:56 +0000 (06:43 +0000)]
am bae7a4d8: (-s ours) am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev

* commit 'bae7a4d8718eae7418b774a82a9a907a5e5a9d75':

9 years agoam 0d5c30d9: (-s ours) am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt...
Adam Lesinski [Thu, 27 Aug 2015 06:43:47 +0000 (06:43 +0000)]
am 0d5c30d9: (-s ours) am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev

* commit '0d5c30d9ba97997e0ec7bfcc1e267c90beb108c4':

9 years agoam 3f66835c: (-s ours) am de335a7d: Merge "Fix Permission Typo." into mnc-dev
Robert Greenwalt [Thu, 27 Aug 2015 06:43:34 +0000 (06:43 +0000)]
am 3f66835c: (-s ours) am de335a7d: Merge "Fix Permission Typo." into mnc-dev

* commit '3f66835cc1ac5c6888da24b305590b3f3600f117':

9 years agoam 809cdd57: (-s ours) am 84005b40: Merge "Use hint text to position handle / floatin...
Mady Mellor [Thu, 27 Aug 2015 06:43:06 +0000 (06:43 +0000)]
am 809cdd57: (-s ours) am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev

* commit '809cdd579abb8193f24a223de12f7b5c291fe757':

9 years agoam d98e6dc2: (-s ours) am 6638c182: Merge "Fix reset permissions on clear data and...
Svetoslav [Thu, 27 Aug 2015 06:42:27 +0000 (06:42 +0000)]
am d98e6dc2: (-s ours) am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev

* commit 'd98e6dc2b0fd50a9522b6a538ed847c0c24aa3c7':

9 years agoam 11be2916: (-s ours) am 9b84b5c5: Merge "Update storage group icon" into mnc-dev
Svet Ganov [Thu, 27 Aug 2015 06:41:43 +0000 (06:41 +0000)]
am 11be2916: (-s ours) am 9b84b5c5: Merge "Update storage group icon" into mnc-dev

* commit '11be291675b512aafd7f090646dbba11bdd63b27':

9 years agoam 99b0a02f: (-s ours) am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast...
Jack Yu [Thu, 27 Aug 2015 06:41:05 +0000 (06:41 +0000)]
am 99b0a02f: (-s ours) am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev

* commit '99b0a02f93ea3280f5b73b530f8d9c2d89973b24':

9 years agoam ac3fb15f: (-s ours) am 705ba960: Merge "Qualify the uid with the userId when grant...
Amith Yamasani [Thu, 27 Aug 2015 06:40:17 +0000 (06:40 +0000)]
am ac3fb15f: (-s ours) am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev

* commit 'ac3fb15fb8501de4ff90923bd295679e6c473fee':

9 years agoam 6a231f48: (-s ours) am dad62b9f: Merge "Finish already paused activity if it shoul...
Wale Ogunwale [Thu, 27 Aug 2015 06:39:29 +0000 (06:39 +0000)]
am 6a231f48: (-s ours) am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit '6a231f489177ca775dd4e60eb72054812c1034f2':

9 years agoam ddcaa330: (-s ours) am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev
Jeff Sharkey [Thu, 27 Aug 2015 06:38:38 +0000 (06:38 +0000)]
am ddcaa330: (-s ours) am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev

* commit 'ddcaa330bd20ae2f566d25bd6776012a9921df6a':

9 years agoam 7ac64f1d: (-s ours) am 9201385f: Merge "Cleaned up the clipping logic for the...
Selim Cinek [Thu, 27 Aug 2015 06:37:56 +0000 (06:37 +0000)]
am 7ac64f1d: (-s ours) am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev

* commit '7ac64f1d8d33ec31123fffbdb804ea406f11fd36':

9 years agoam a1fed110: (-s ours) am 224f0369: Merge "com.android.mms is no more, so removing...
Ian Pedowitz [Thu, 27 Aug 2015 06:37:11 +0000 (06:37 +0000)]
am a1fed110: (-s ours) am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev

* commit 'a1fed110ef57dab059294ad8c45cf67420fac760':

9 years agoam 319eacbf: (-s ours) am 12328ef4: Merge "Fingerprint: Add post enroll interface...
Sasha Levitskiy [Thu, 27 Aug 2015 06:36:23 +0000 (06:36 +0000)]
am 319eacbf: (-s ours) am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev

* commit '319eacbff2f0be78f3d0698cb73d05bc1e75ea23':

9 years agoam 593fda72: (-s ours) am e6fd76c2: Merge "Don\'t use fingerId when creating names...
Jim Miller [Thu, 27 Aug 2015 06:35:21 +0000 (06:35 +0000)]
am 593fda72: (-s ours) am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev

* commit '593fda725aa1d7dcab22aa59eafa15d76911947c':

9 years agoam a69dd6a2: (-s ours) am 99b8820f: Use fingerid 0 when checking failed attempts.
Vineeta Srivastava [Thu, 27 Aug 2015 06:34:37 +0000 (06:34 +0000)]
am a69dd6a2: (-s ours) am 99b8820f: Use fingerid 0 when checking failed attempts.

* commit 'a69dd6a246f75bd7603058325287a3f916472a44':

9 years agoam 0fdf0449: (-s ours) am 8f596907: Merge "Change sequence of call removal from Phone...
Roshan Pius [Thu, 27 Aug 2015 06:34:19 +0000 (06:34 +0000)]
am 0fdf0449: (-s ours) am 8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev

* commit '0fdf044916512dff98b8560b2c1b956f8853216d':

9 years agoam 0fd074f1: (-s ours) am 6d712e06: Remove volume motion delay
Jorim Jaggi [Thu, 27 Aug 2015 06:34:03 +0000 (06:34 +0000)]
am 0fd074f1: (-s ours) am 6d712e06: Remove volume motion delay

* commit '0fd074f186f3144054814c928801186e7c5cddfe':

9 years agoam 5d72dfa1: (-s ours) am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
Jeff Sharkey [Thu, 27 Aug 2015 06:33:44 +0000 (06:33 +0000)]
am 5d72dfa1: (-s ours) am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev

* commit '5d72dfa1906e582b6b64743ff265970296cf406a':

9 years agoam 51c94eee: (-s ours) am c66b90fe: Merge "Generate stable MTP storage IDs." into...
Jeff Sharkey [Thu, 27 Aug 2015 06:33:03 +0000 (06:33 +0000)]
am 51c94eee: (-s ours) am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev

* commit '51c94eeeddce89639df8167f515cb678ad650fc1':

9 years agoam c38c08df: (-s ours) am 2a33526b: am 9568a412: am 3d52c10e: Docs: Adds fugu system...
David Friedman [Thu, 27 Aug 2015 06:32:20 +0000 (06:32 +0000)]
am c38c08df: (-s ours) am 2a33526b: am 9568a412: am 3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.

* commit 'c38c08df4b4bd5f011640c7581307352c68fd47b':

9 years agoam 2cff299f: (-s ours) am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionMa...
Robert Greenwalt [Thu, 27 Aug 2015 06:31:55 +0000 (06:31 +0000)]
am 2cff299f: (-s ours) am 8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev

* commit '2cff299f1b591172703ccba759d9d75653a43ddd':

9 years agoam 3fba1a1a: (-s ours) am 7f806ec2: Merge "Dump internal state of ImageWallpaper...
Adrian Roos [Thu, 27 Aug 2015 06:31:38 +0000 (06:31 +0000)]
am 3fba1a1a: (-s ours) am 7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev

* commit '3fba1a1ad1009cf24e0778c216bf7c21f24aff0c':

9 years agoam ef2dbbbd: (-s ours) am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode...
Chien-Yu Chen [Thu, 27 Aug 2015 06:31:22 +0000 (06:31 +0000)]
am ef2dbbbd: (-s ours) am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

* commit 'ef2dbbbdbd4d63d5a148251b82f0a92b7b5ae629':

9 years agoam d2e88848: (-s ours) am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTO...
Tingting Wang [Thu, 27 Aug 2015 06:31:05 +0000 (06:31 +0000)]
am d2e88848: (-s ours) am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev

* commit 'd2e88848f45162f5c4488a2232d10d8040f8e11b':

9 years agoam 67aec4f6: (-s ours) am d25093d2: Merge "Reject AlgorithmParameters of wrong type...
Alex Klyubin [Thu, 27 Aug 2015 06:30:41 +0000 (06:30 +0000)]
am 67aec4f6: (-s ours) am d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev

* commit '67aec4f660614281d3161c63cf8f2b47bcc44ebf':

9 years agoam 51fff988: (-s ours) am 3aa1b1e5: Merge "Lock screen text: consider possible WFC...
Etan Cohen [Thu, 27 Aug 2015 06:29:38 +0000 (06:29 +0000)]
am 51fff988: (-s ours) am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev

* commit '51fff9886b0fcf64bef7b0976a2fdc29d019dbc7':

9 years agoam 161b159a: (-s ours) am a8c247e0: Merge "Fixed a bug where collapserunnables where...
Selim Cinek [Thu, 27 Aug 2015 06:29:02 +0000 (06:29 +0000)]
am 161b159a: (-s ours) am a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev

* commit '161b159aa01d0f7f9546336d8f702bff0cacc1e9':

9 years agoam 6bc5c3e1: (-s ours) am 7b12deb5: am 07e1c409: Merge "Android always has <malloc...
Elliott Hughes [Thu, 27 Aug 2015 06:28:53 +0000 (06:28 +0000)]
am 6bc5c3e1: (-s ours) am 7b12deb5: am 07e1c409: Merge "Android always has <malloc.h>."

* commit '6bc5c3e1a5945762c61359884938d554c6c0aeb3':

9 years agoam 2157b8b1: (-s ours) am fede4258: Merge "Remove bang from not connected wifi" into...
Jason Monk [Thu, 27 Aug 2015 06:28:45 +0000 (06:28 +0000)]
am 2157b8b1: (-s ours) am fede4258: Merge "Remove bang from not connected wifi" into mnc-dev

* commit '2157b8b111e6eedf2fa6939107fe720727c30a55':

9 years agoam df15e36e: (-s ours) am c0344a80: Merge "audio: add definitions for devices connect...
Eric Laurent [Thu, 27 Aug 2015 06:28:33 +0000 (06:28 +0000)]
am df15e36e: (-s ours) am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev

* commit 'df15e36e19aab89b29e4ed57f63a90e134791970':

9 years agoam 479666cd: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 27 Aug 2015 06:28:25 +0000 (06:28 +0000)]
am 479666cd: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '479666cd067322b974849d4728b53eecfe37a217':

9 years agoam 6cdaafab: (-s ours) am 32c4802a: Merge "provide a cleaner notification dump" into...
Chris Wren [Thu, 27 Aug 2015 06:28:16 +0000 (06:28 +0000)]
am 6cdaafab: (-s ours) am 32c4802a: Merge "provide a cleaner notification dump" into mnc-dev

* commit '6cdaafab5621193d9ad9e8b57f070435e5d15828':

9 years agoam 9b6ad206: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 27 Aug 2015 06:28:07 +0000 (06:28 +0000)]
am 9b6ad206: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9b6ad2062193c422409b675762f4e53071b6461f':

9 years agoam 05dfdf14: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 27 Aug 2015 06:27:45 +0000 (06:27 +0000)]
am 05dfdf14: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '05dfdf14000263020691165ed8625bfb4f2189cb':

9 years agoam 34c562a4: (-s ours) am c088e30f: Merge "Clarify javadoc of setPermissionPolicy...
Benjamin Franz [Thu, 27 Aug 2015 06:27:16 +0000 (06:27 +0000)]
am 34c562a4: (-s ours) am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '34c562a402c4f926f5891f93e9079a8afa44f972':

9 years agoam 21146967: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 27 Aug 2015 06:26:52 +0000 (06:26 +0000)]
am 21146967: (-s ours) am 20ad9246: (-s ours) Import translations. DO NOT MERGE

* commit '211469673cc78c1f8f6469b4fc903f14e687376c':

9 years agoam c0ae18fe: (-s ours) am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change ...
Dirk Dougherty [Thu, 27 Aug 2015 06:26:33 +0000 (06:26 +0000)]
am c0ae18fe: (-s ours) am e3bb8e43: am cc040d58: am 7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs

* commit 'c0ae18fed93fcbf260718fe6b90fceece5906cd4':

9 years agoam 27ee95eb: (-s ours) am a2de7fc9: Merge "Prevent accidental unlocking of USB data...
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 06:26:25 +0000 (06:26 +0000)]
am 27ee95eb: (-s ours) am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

* commit '27ee95eb66aacf8d015af8dca2d20d76356a2911':

9 years agoam 0e70616c: (-s ours) am 89592760: Merge "Expose time-interval detail query on INetw...
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 06:26:17 +0000 (06:26 +0000)]
am 0e70616c: (-s ours) am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev

* commit '0e70616cb44d583ae2d0afea77810259e600548c':

9 years agoam 15ed547d: (-s ours) am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version...
Dirk Dougherty [Thu, 27 Aug 2015 06:26:09 +0000 (06:26 +0000)]
am 15ed547d: (-s ours) am bc243440: am 590a25a3: am 70f1aadd: Doc change: add version notes for preview 2.

* commit '15ed547d7383b8fd20d1d48f41573c2f5429d20a':

9 years agoam 49a15309: (-s ours) am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware...
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 06:25:55 +0000 (06:25 +0000)]
am 49a15309: (-s ours) am 4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev

* commit '49a15309ea5012164cc6c014cf6f14fbcfb98b6f':

9 years agoam 93492e02: (-s ours) am 26e58f09: am b05c2beb: Merge "Move listen() over to using...
Neil Fuller [Thu, 27 Aug 2015 06:25:13 +0000 (06:25 +0000)]
am 93492e02: (-s ours) am 26e58f09: am b05c2beb: Merge "Move listen() over to using android.system.Os"

* commit '93492e02cc4e5884cd7de8dcec14493255734c29':

9 years agoam 782e020b: (-s ours) am 8ecba862: am 638ecb76: am 773861f0: Merge "Docs: Localized...
Dirk Dougherty [Thu, 27 Aug 2015 06:24:03 +0000 (06:24 +0000)]
am 782e020b: (-s ours) am 8ecba862: am 638ecb76: am 773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs

* commit '782e020ba425865b3324a4743687ab0b0c0720ad':

9 years agoam 906402f2: (-s ours) am d3967e3f: am 0922b82a: am a7e0bfa6: Docs: Updates to M...
David Friedman [Thu, 27 Aug 2015 06:23:20 +0000 (06:23 +0000)]
am 906402f2: (-s ours) am d3967e3f: am 0922b82a: am a7e0bfa6: Docs: Updates to M Preview 2 Download pages.

* commit '906402f282fa90d0462b3ec114204254fc3bd2b4':

9 years agoam 837825d6: (-s ours) am a939d7e8: am cb7a3b6b: am 201cfff4: Merge "Docs: Updated...
David Friedman [Thu, 27 Aug 2015 06:22:57 +0000 (06:22 +0000)]
am 837825d6: (-s ours) am a939d7e8: am cb7a3b6b: am 201cfff4: Merge "Docs: Updated download page for M Preview; new archive page for older versions" into mnc-preview-docs

* commit '837825d624e32dec66100263f3af534ce018ace7':

9 years agoam 69b67d42: (-s ours) am f6fd4ef8: am 73ce8abb: am 869050b3: Docs: Updated Preview...
David Friedman [Thu, 27 Aug 2015 06:22:38 +0000 (06:22 +0000)]
am 69b67d42: (-s ours) am f6fd4ef8: am 73ce8abb: am 869050b3: Docs: Updated Preview TOC reflecting the newly localized pages.

* commit '69b67d42c4919919865354014422574a76960460':

9 years agoam b58a0cd4: (-s ours) am e32f9c88: Merge changes I29f7abe6,I6c831467 into mnc-dev
Deepanshu Gupta [Thu, 27 Aug 2015 06:22:01 +0000 (06:22 +0000)]
am b58a0cd4: (-s ours) am e32f9c88: Merge changes I29f7abe6,I6c831467 into mnc-dev

* commit 'b58a0cd4fc13e1aa7f16191e2ef02781fdae5f3f':

9 years agoam 236387f0: (-s ours) am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev
Deepanshu Gupta [Thu, 27 Aug 2015 06:20:55 +0000 (06:20 +0000)]
am 236387f0: (-s ours) am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev

* commit '236387f05ce34fa5e83141d3eb2cdb3e60727428':

9 years agoam 000329eb: (-s ours) am a4546b0e: Merge "Implement tools:list_item for RecyclerView...
Deepanshu Gupta [Thu, 27 Aug 2015 06:19:56 +0000 (06:19 +0000)]
am 000329eb: (-s ours) am a4546b0e: Merge "Implement tools:list_item for RecyclerView." into mnc-dev

* commit '000329eb2b01db13015f16ad89cc5ee16d4de945':

9 years agoam 87c587bd: (-s ours) am 0c784ffa: Merge "Add roundess to configuration" into mnc-dev
Deepanshu Gupta [Thu, 27 Aug 2015 06:19:12 +0000 (06:19 +0000)]
am 87c587bd: (-s ours) am 0c784ffa: Merge "Add roundess to configuration" into mnc-dev

* commit '87c587bde4654aad2d96e7be156e0cd46b8d2359':

9 years agoam ad27615c: (-s ours) am 1629717f: Merge "Update tests per new layoutlib_api" into...
Deepanshu Gupta [Thu, 27 Aug 2015 06:18:46 +0000 (06:18 +0000)]
am ad27615c: (-s ours) am 1629717f: Merge "Update tests per new layoutlib_api" into mnc-dev

* commit 'ad27615cad9cda98703fb9cbe99f566941beffaa':

9 years agoam 2e9570ec: (-s ours) am 8d6f6606: am 64e3997a: am 97dcc6fd: Docs: Remaining L10N...
David Friedman [Thu, 27 Aug 2015 06:18:07 +0000 (06:18 +0000)]
am 2e9570ec: (-s ours) am 8d6f6606: am 64e3997a: am 97dcc6fd: Docs: Remaining L10N for M Preview pages (ru).

* commit '2e9570ec1d2a6487645cc9e07c05a15ca49650aa':