git.osdn.net Git - android-x86/frameworks-base.git/log

Jim Miller [Thu, 27 Aug 2015 19:01:36 +0000 (19:01 +0000)]

am fbdd8b59: am 0c152b9e: (-s ours) am 30c5da9c: Don\'t call cancel() when fingerprint auth fails

* commit 'fbdd8b59dc7f7c12c967d89c1ac3a2273d566f24':

commit | commitdiff | tree

Daniel Sandler [Thu, 27 Aug 2015 19:01:26 +0000 (19:01 +0000)]

am eef5d8de: am b10d22ff: (-s ours) am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev

* commit 'eef5d8de0834156c5d2583b222c624b353fc9ca5':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 19:01:19 +0000 (19:01 +0000)]

am 89fd13dc: am d732799a: (-s ours) am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev

* commit '89fd13dc628c1e33de492f3ce96844e121302c1c':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 19:01:10 +0000 (19:01 +0000)]

am 3e9d32d3: am 98169db3: (-s ours) am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev

* commit '3e9d32d3a5bfebf8f96f1bfa87464bb5af2bd125':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 19:00:58 +0000 (19:00 +0000)]

am 1fbb06f6: am 710091b1: (-s ours) am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev

* commit '1fbb06f6a7f2d4de11668ad5f46481cfc593ae72':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 19:00:40 +0000 (19:00 +0000)]

am 2c7ea6ed: am e987d609: (-s ours) am 26aa04c3: Fix state weirdness in the panel

* commit '2c7ea6edf51fd1369a374c7948ebccd556df9fbc':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 19:00:20 +0000 (19:00 +0000)]

am ee0d0692: am e6286724: (-s ours) am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."

* commit 'ee0d0692502312caec57e3bf590e41aebc0df530':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:59:53 +0000 (18:59 +0000)]

am 84b2ebd3: am f5893c0b: (-s ours) am 95c6daed: Fix doze mode

* commit '84b2ebd35734ff142ed3b33a8286c4eb8efe978c':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 18:59:22 +0000 (18:59 +0000)]

am 43d0afdd: am 96a10552: (-s ours) am e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev

* commit '43d0afdd46cf2960a8dc6fb447edaefebcddddd9':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:58:48 +0000 (18:58 +0000)]

am f337ae0b: am 36a2759f: (-s ours) am 4a0e791c: Workaround View.post issues to fix runtime crash

* commit 'f337ae0b81c30bf980e7b295ce73b5003d3fd85d':

commit | commitdiff | tree

Billy Lau [Thu, 27 Aug 2015 18:58:18 +0000 (18:58 +0000)]

am da482a2e: am 77bb8143: (-s ours) am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev

* commit 'da482a2ec8b4860168a76f73e1ec3155e6055e95':

commit | commitdiff | tree

Ji Yang [Thu, 27 Aug 2015 18:57:46 +0000 (18:57 +0000)]

am 2dbea73c: am ba29aaf2: (-s ours) am 499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev

* commit '2dbea73c1028314a87cd3a992e82bc792a65fd70':

commit | commitdiff | tree

Dan Sandler [Thu, 27 Aug 2015 18:57:19 +0000 (18:57 +0000)]

am 85154c01: am b4c12fdb: (-s ours) am 25ffc7ad: Accessibility: Read the time correctly in quick settings.

* commit '85154c011462f25e55a56309200fcf17ecfba55b':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 18:56:55 +0000 (18:56 +0000)]

am c13d1025: (-s ours) am b4a5f7d9: (-s ours) am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev

* commit 'c13d10257da28260c3dd5f9cb2619d14cb79d289':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:56:42 +0000 (18:56 +0000)]

am 1f33e637: am 6f73eb0c: (-s ours) am 393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev

* commit '1f33e6377e8ae5b4d7be716259c0cf75dfed1402':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:56:24 +0000 (18:56 +0000)]

am 0f3ae1b1: am 78406854: (-s ours) am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev

* commit '0f3ae1b10cd4196dabb9c5e4628ccc2c663afd1e':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 18:55:55 +0000 (18:55 +0000)]

am 1eadf33b: (-s ours) am 7a763bc1: (-s ours) am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev

* commit '1eadf33b210e984f9a3c0b8a35dfcd523be8fb0f':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:55:10 +0000 (18:55 +0000)]

am a5a031fe: am bbe80810: (-s ours) am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev

* commit 'a5a031febfce9b97125f8a01817cf36efbbdb6b7':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 18:54:33 +0000 (18:54 +0000)]

am 11b2e973: am 0322ccf6: (-s ours) am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev

* commit '11b2e9731321b403e348181d832696772efcd9c9':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 18:54:00 +0000 (18:54 +0000)]

am ced27b44: am 401de11f: (-s ours) am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev

* commit 'ced27b4451b1e4e7497b7c6430a216e954e1fca9':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:53:31 +0000 (18:53 +0000)]

am a10256e6: am 4854d113: (-s ours) am b86048da: Merge "Always return content Uri for downloads." into mnc-dev

* commit 'a10256e658c27757c96e05a5d7e4f8301f95979b':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 18:53:12 +0000 (18:53 +0000)]

am f0e44162: am 9c5a06aa: (-s ours) am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev

* commit 'f0e44162220c2f494368b96d813e7c2af377b9db':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 18:52:55 +0000 (18:52 +0000)]

am 0010f9dc: am c4887d0f: (-s ours) am 25782ef8: Merge "Added stack id to TaskRecord dump." into mnc-dev

* commit '0010f9dc9f1840024afe90c6a4f94c8d9f8f999b':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 18:52:39 +0000 (18:52 +0000)]

am 5e03f8a5: am d26bc1c0: (-s ours) am 944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev

* commit '5e03f8a537f88269035e55089dc68458979a36a8':

commit | commitdiff | tree

Maurice Lam [Thu, 27 Aug 2015 18:52:17 +0000 (18:52 +0000)]

am d735e26d: am 7ce565f3: (-s ours) am 75d958c4: Merge "Disable launching assist during setup" into mnc-dev

* commit 'd735e26d177e6e28d867d8ae824919fed845566e':

commit | commitdiff | tree

Christine Hallstrom [Thu, 27 Aug 2015 18:51:49 +0000 (18:51 +0000)]

am c8870b81: am 584d6121: (-s ours) am a42e6816: Merge "Change NTP polling interval from 10 days to 24 hours." into mnc-dev

* commit 'c8870b8158ff91a4e2ca4a88f60ad1b97b6cb431':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 18:51:24 +0000 (18:51 +0000)]

am 945f5cbc: (-s ours) am 62e2b84c: (-s ours) am 3986360a: (-s ours) Import translations. DO NOT MERGE

* commit '945f5cbcef07310b69da04d7b26031f5f8803a80':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:51:04 +0000 (18:51 +0000)]

am e31aa5ba: am 862dc4f2: (-s ours) am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev

* commit 'e31aa5ba0614796f56d7a74bcb5b87613c78e186':

commit | commitdiff | tree

Sailesh Nepal [Thu, 27 Aug 2015 18:50:50 +0000 (18:50 +0000)]

am 33698b01: am 04a69aa1: (-s ours) am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev

* commit '33698b01acc1d0fc9916959411cd6f2e0a42a139':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:50:36 +0000 (18:50 +0000)]

am 8699d162: am 7b09e2c0: (-s ours) am a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev

* commit '8699d16268568dfe1236a03c3c320a420d0d7d53':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:50:23 +0000 (18:50 +0000)]

am 90ec63e0: am 986812a6: (-s ours) am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev

* commit '90ec63e0d17e40b1ca6f90f0d508e6c029ace82a':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 18:50:11 +0000 (18:50 +0000)]

am c9f3e4e9: am c2a02439: (-s ours) am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev

* commit 'c9f3e4e911b5c7263b748520d089fbb302e45c68':

commit | commitdiff | tree

Nicolas Prévot [Thu, 27 Aug 2015 18:49:59 +0000 (18:49 +0000)]

am d0f33090: am 91775db6: (-s ours) am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev

* commit 'd0f330904e1acff710964910648cb10738fcfb2f':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 18:49:44 +0000 (18:49 +0000)]

am afad2103: am 49d7d481: (-s ours) am a7e6be68: am 7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."

* commit 'afad21033ee7dd5126936e7d0e5e86bef51b46eb':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 18:49:28 +0000 (18:49 +0000)]

am c4abc5fc: am 2eeb47c6: (-s ours) am 1bd310e1: Merge "import more metrics enums" into mnc-dev

* commit 'c4abc5fc9041117f6f79f94c056818505d918393':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 18:49:02 +0000 (18:49 +0000)]

am 711064ca: am 1ed96576: (-s ours) am 30813942: Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev

* commit '711064ca75526a390ab4a44410671bd2083a6383':

commit | commitdiff | tree

Narayan Kamath [Thu, 27 Aug 2015 18:48:34 +0000 (18:48 +0000)]

am dac15b29: am f1fce87a: (-s ours) am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

* commit 'dac15b29dc9fe29637d4c4e9b265769775138e44':

commit | commitdiff | tree

Martijn Coenen [Thu, 27 Aug 2015 18:48:09 +0000 (18:48 +0000)]

am d8815b8f: am 966e276f: (-s ours) am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev

* commit 'd8815b8f89593f265226034bcc394dafd25d54a6':

commit | commitdiff | tree

Shawn Willden [Thu, 27 Aug 2015 18:47:56 +0000 (18:47 +0000)]

am 39d439fc: am 48951e4a: (-s ours) am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

* commit '39d439fc43eb4005505c5099148789ace19d798f':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:47:44 +0000 (18:47 +0000)]

am 2572a050: am 667f35fa: (-s ours) am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev

* commit '2572a05005f6aff22a9c5c34cb1a2a4f2266d2a1':

commit | commitdiff | tree

Ronghua Wu [Thu, 27 Aug 2015 18:47:32 +0000 (18:47 +0000)]

am 7fc2ce36: am da0b2ce3: (-s ours) am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev

* commit '7fc2ce36eac3f9244be1f0db2ae0551f4d25f3ff':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 18:47:20 +0000 (18:47 +0000)]

am a00f8471: am 37cf391c: (-s ours) am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev

* commit 'a00f8471748c0bdc6dfb14d71dd7b1fc02a8e67c':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 18:47:07 +0000 (18:47 +0000)]

am 8b5a0810: am cf887f5c: (-s ours) am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev

* commit '8b5a081023883043e0c5ef0c87fd036785e686aa':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 18:46:49 +0000 (18:46 +0000)]

am 532380cc: am 9d3a0efa: (-s ours) am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev

* commit '532380cc934716f13a8c20b6e1e8c2908973c30e':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:46:27 +0000 (18:46 +0000)]

am b7eebd17: am 9466fa27: (-s ours) am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev

* commit 'b7eebd17017b772f3ecef690748f9cdbee565f02':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 18:45:50 +0000 (18:45 +0000)]

am d22e09c0: am 139dabcc: (-s ours) am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev

* commit 'd22e09c0a686be5c85466a029a6d6e6fd20061cf':

commit | commitdiff | tree

Aravind Akella [Thu, 27 Aug 2015 18:45:29 +0000 (18:45 +0000)]

am 220b50de: am 4633f371: (-s ours) am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

* commit '220b50dec33b50467b2bcdc9d0826d695a1a5f6d':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:45:01 +0000 (18:45 +0000)]

am 4557aa20: am 66c3fc38: (-s ours) am 0d210f63: Animation for touch, wake and unlock

* commit '4557aa20183a9ab90c91ad52ab94855abbf12544':

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 18:44:48 +0000 (18:44 +0000)]

am 51409795: am 36d5edff: (-s ours) am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev

* commit '514097953c8df046d0089ff59c2f5a4f6dd3f122':

commit | commitdiff | tree

Zach Johnson [Thu, 27 Aug 2015 18:44:41 +0000 (18:44 +0000)]

am 81504f8e: am 6b026e31: (-s ours) am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev

* commit '81504f8e983aba3fa37993153af480d8867c1661':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 18:44:33 +0000 (18:44 +0000)]

am 65696a5f: am beef2b78: (-s ours) am f2c616ed: Merge "Partially revert package freezing" into mnc-dev

* commit '65696a5f9eeef491d156ac0f99b114b40790a29d':

commit | commitdiff | tree

Tyler Gunn [Thu, 27 Aug 2015 18:44:25 +0000 (18:44 +0000)]

am ccb5f149: am 11f2dbf7: (-s ours) am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev

* commit 'ccb5f1490fdd00d33a4208af743437c19096224c':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 18:44:15 +0000 (18:44 +0000)]

am 09002879: am 8b679bfa: (-s ours) am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev

* commit '09002879a59cf9ac46febe76a51afd84640a80d5':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:43:53 +0000 (18:43 +0000)]

am fc86bf40: am 69aa584f: (-s ours) am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev

* commit 'fc86bf40ffade93197a620cff401a2d9726755bb':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 18:43:22 +0000 (18:43 +0000)]

am f29bb1ca: am 1bf3bec7: (-s ours) am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev

* commit 'f29bb1ca50331e208a3800152fcb4cf244289464':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 18:42:39 +0000 (18:42 +0000)]

am 815f7327: am e6e2c108: (-s ours) am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev

* commit '815f73274947e5689eb7ee309bb51a3617c1983d':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:42:02 +0000 (18:42 +0000)]

am 60365f49: am 88b65478: (-s ours) am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev

* commit '60365f4934ea3f2b85222f316844ee4202a6e019':

commit | commitdiff | tree

Lorenzo Colitti [Thu, 27 Aug 2015 18:41:34 +0000 (18:41 +0000)]

am 6bb99805: am 8f4787e6: (-s ours) am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev

* commit '6bb99805ea47ffef50d68d15c1b13bb4ae76b696':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:41:12 +0000 (18:41 +0000)]

am 3e980306: am ad780f33: (-s ours) am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev

* commit '3e98030605c9e6dcb06a8d0edf1a968423e5a806':

commit | commitdiff | tree

Mady Mellor [Thu, 27 Aug 2015 18:40:53 +0000 (18:40 +0000)]

am 259664d6: am 506424fc: (-s ours) am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev

* commit '259664d6a7a5044da8e48518f12d76563bf72cad':

commit | commitdiff | tree

Ruben Brunk [Thu, 27 Aug 2015 18:40:36 +0000 (18:40 +0000)]

am e20c0350: am ba140949: (-s ours) am ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev

* commit 'e20c0350b510d8dfa52cf940686ed6970aecea37':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:40:15 +0000 (18:40 +0000)]

am 6dbeec3a: am 33d4bd4a: (-s ours) am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev

* commit '6dbeec3aacbc55289bd4c73258dd7a11ae1a5626':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 18:39:46 +0000 (18:39 +0000)]

am c6bd2e1e: am 089f65ed: (-s ours) am f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev

* commit 'c6bd2e1e9d7606a25cb3a7eaf1d636e3e2c8a1a7':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:39:18 +0000 (18:39 +0000)]

am 65aceef5: am cb3ae68e: (-s ours) am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev

* commit '65aceef50cd174edf10c6c3400d21eef35809cf5':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 18:38:40 +0000 (18:38 +0000)]

am cf2dedfd: am 199c0b3f: (-s ours) am e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev

* commit 'cf2dedfd4459c866e49af8e4650a338fa6736746':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:38:06 +0000 (18:38 +0000)]

am b67af9d8: am 759fe1ec: (-s ours) am 2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.

* commit 'b67af9d88ac1b04db096eace6b002e2a7e9ca19d':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 18:37:32 +0000 (18:37 +0000)]

am ceeb9207: am 07be576d: (-s ours) am 71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev

* commit 'ceeb92072f4dfeeefe80319df688be3a3214bfb6':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:37:08 +0000 (18:37 +0000)]

am 3a9537c7: am 97bb9d05: (-s ours) am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev

* commit '3a9537c75fa14c7447560e892169a777d4931875':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 18:36:50 +0000 (18:36 +0000)]

am 9549afba: am c150c328: (-s ours) am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev

* commit '9549afba91f534e503b642d5fc1ae3f55fe41c4a':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:36:33 +0000 (18:36 +0000)]

am f0103c99: am 0483d720: (-s ours) am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""

* commit 'f0103c996ae25318c997a1967bcc529d0b0734e0':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 18:36:05 +0000 (18:36 +0000)]

am 1b8b549f: am 515e444f: (-s ours) am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev

* commit '1b8b549f17df17f7c2797073f2e7c267e9054b31':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:35:37 +0000 (18:35 +0000)]

am 54ce3a0d: am 817ea6d4: (-s ours) am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev

* commit '54ce3a0d590224af52633f047eb1c4e705e9e305':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:35:20 +0000 (18:35 +0000)]

am 3a69ed5d: am d315926a: (-s ours) am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev

* commit '3a69ed5d6277c941ea4a7d7766a21c4cf55793e2':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:35:03 +0000 (18:35 +0000)]

am de26af62: am ab173ca6: (-s ours) am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit 'de26af621536b9be710eafb6a481f0a672212702':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:34:49 +0000 (18:34 +0000)]

am cbb68664: am bd193f38: (-s ours) am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

* commit 'cbb686644eef8bac1c64abf5c3d2b32cbd1b0807':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 18:34:37 +0000 (18:34 +0000)]

am 560ca8fa: am 71fb7e59: (-s ours) am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '560ca8fa035fa44e659111a89faa69f0c962f6a5':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 18:34:23 +0000 (18:34 +0000)]

am f356caa2: am a37a1b00: (-s ours) am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev

* commit 'f356caa20d02818baa68513a62fc2ef189f7e606':

commit | commitdiff | tree

Tim Volodine [Thu, 27 Aug 2015 18:34:07 +0000 (18:34 +0000)]

am 6b7c8b9d: am 6c1e0991: (-s ours) am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

* commit '6b7c8b9d573cb15cbf06d301ef2fc87e3403ee07':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:33:42 +0000 (18:33 +0000)]

am d3c7ffa2: am 2d574990: (-s ours) am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit 'd3c7ffa21dcb2bb4c9fbe92171feb3a413a2a7ee':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:33:16 +0000 (18:33 +0000)]

am c242dd4b: (-s ours) am c22b89ad: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

* commit 'c242dd4b45330877cc07d9f76cb5bf40309b13c2':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 18:32:53 +0000 (18:32 +0000)]

am ec4aae64: am 229b49c3: (-s ours) am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit 'ec4aae642a2b802d5800c714aa4ebbee10faf4ad':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 18:32:39 +0000 (18:32 +0000)]

am 6dc9b31d: am aaa23354: (-s ours) am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev

* commit '6dc9b31d628b52dc05adc70534bb9d5d1fa2f869':

commit | commitdiff | tree

Erik Kline [Thu, 27 Aug 2015 18:32:24 +0000 (18:32 +0000)]

am c729f4da: am 229e4d9a: (-s ours) am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

* commit 'c729f4da9f2e2803368f4f6b4ab45943b0e75186':

commit | commitdiff | tree

Nick Kralevich [Thu, 27 Aug 2015 18:32:11 +0000 (18:32 +0000)]

am 0fc1b889: am faf11661: (-s ours) am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"

* commit '0fc1b8895a264933593a7573d82055d1341d24ef':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:32:00 +0000 (18:32 +0000)]

am b9eee894: am fdda1ec3: (-s ours) am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev

* commit 'b9eee894bb46777e80de437bd79fb7341a33f11c':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 18:31:47 +0000 (18:31 +0000)]

am 62b769fb: am fe8310b7: (-s ours) am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

* commit '62b769fb1baac94cb9554e850251ec7806ec2a40':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:31:35 +0000 (18:31 +0000)]

am 71823939: am c6ab2d3d: (-s ours) am f3255489: Fix ambient display

* commit '718239392bb929c3d706b0238bd96ca2e2246d9e':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:31:15 +0000 (18:31 +0000)]

am e9c9ca41: am 9736d0cc: (-s ours) am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev

* commit 'e9c9ca415e994f446018210d976a02f84ff5291c':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 18:30:58 +0000 (18:30 +0000)]

am 68d0dbc1: am d475549f: (-s ours) am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev

* commit '68d0dbc1bd15e167853b9e64b9ba1340a38e2937':

commit | commitdiff | tree

Andreas Gampe [Thu, 27 Aug 2015 18:30:35 +0000 (18:30 +0000)]

am 05d87e3b: am 44959639: (-s ours) am ac2c632f: am c0999f78: Merge "Frameworks/base: Hand fingerprint to ART"

* commit '05d87e3bc32dfe5d5d3ad44cf8414db83bc5b658':

commit | commitdiff | tree

Chris Banes [Thu, 27 Aug 2015 18:30:13 +0000 (18:30 +0000)]

am c64b0e87: am a8c721a4: (-s ours) am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs

* commit 'c64b0e870f22fbd70cbc729cd742dd49618c7b49':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:30:02 +0000 (18:30 +0000)]

am ac859598: am ba43413d: (-s ours) am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI

* commit 'ac859598cc4fe3284ca093b7eb8d255afd8307a6':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 18:29:53 +0000 (18:29 +0000)]

am b7114ad1: am a531ddca: (-s ours) am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev

* commit 'b7114ad1275324a3fa0c0b4cce655709c4db11e0':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:29:45 +0000 (18:29 +0000)]

am 51f50946: am 29793dd4: (-s ours) am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev

* commit '51f50946d6b37da3e89e141a926f607a774ae617':

commit | commitdiff | tree

Andreas Gampe [Thu, 27 Aug 2015 18:29:38 +0000 (18:29 +0000)]

am 63c74e6b: am 7d33ecc1: (-s ours) am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

* commit '63c74e6b9b6e29dc2d0b596493ff5eae65bc15ce':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 18:29:30 +0000 (18:29 +0000)]

am 50f36f8f: (-s ours) am 59ddd576: (-s ours) am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev

* commit '50f36f8f5d0f1e579722e76a92470d541a1c1468':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 18:29:22 +0000 (18:29 +0000)]

am f5ff4356: am 69259b13: (-s ours) am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev

* commit 'f5ff43568df0646d23aa36de3f68eb521eee95cb':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:29:15 +0000 (18:29 +0000)]

am ed8cf649: am 5ddefc17: (-s ours) am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev

* commit 'ed8cf64962332b128f8e230367cdc817620170f8':

commit | commitdiff | tree

Andrei Stingaceanu [Thu, 27 Aug 2015 18:29:04 +0000 (18:29 +0000)]

am 60796c52: am da905717: (-s ours) am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev

* commit '60796c5260609dfbbce73f28fb7e66e35ccc9da4':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 18:28:35 +0000 (18:28 +0000)]

am 1aca9d54: am 71a7651a: (-s ours) am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev

* commit '1aca9d549030ecffd51b73e3446da744a5ef368e':