OSDN Git Service

android-x86/frameworks-base.git
9 years agoam d0162e73: am efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert...
George Mount [Mon, 27 Jul 2015 19:52:16 +0000 (19:52 +0000)]
am d0162e73: am efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit 'd0162e730950f92933265bcbc90f5c38105b66ab':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

9 years agoam efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a...
George Mount [Mon, 27 Jul 2015 19:31:59 +0000 (19:31 +0000)]
am efbfd2ad: am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit 'efbfd2ad8bf5f251b938c0f9d91d38a66c333939':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

9 years agoam 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Updat...
George Mount [Mon, 27 Jul 2015 19:18:34 +0000 (19:18 +0000)]
am 02730bab: am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit '02730bab573abdea617075d77276b216ae88aed5':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

9 years agoam fb2927df: am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecess...
Nick Kralevich [Mon, 27 Jul 2015 19:01:28 +0000 (19:01 +0000)]
am fb2927df: am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"

* commit 'fb2927dfbc0b0cd43cad2be494ce46a9a447a6e7':
  ActivityManagerService: delete unnecessary mkdir

9 years agoam d1f1985f: am 4b3f6caf: am d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for...
Fyodor Kupolov [Mon, 27 Jul 2015 19:01:21 +0000 (19:01 +0000)]
am d1f1985f: am 4b3f6caf: am d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

* commit 'd1f1985f33df9915dbd1895433c2c74a0493613c':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION

9 years agoam 6c3fc22c: am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap...
Chris Craik [Mon, 27 Jul 2015 19:01:14 +0000 (19:01 +0000)]
am 6c3fc22c: am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '6c3fc22c6206fe883c0252c02c69090ffc3360f3':
  Fix bitmap get/set pixels for ALPHA_8

9 years agoam 4a30f4d8: am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix...
Phil Burk [Mon, 27 Jul 2015 19:01:07 +0000 (19:01 +0000)]
am 4a30f4d8: am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev

* commit '4a30f4d864fb208890ce7f65ebebcec287c10d2f':
  MIDI: fix running status parser

9 years agoam da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data bindin...
George Mount [Mon, 27 Jul 2015 18:55:00 +0000 (18:55 +0000)]
am da30e09b: am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit 'da30e09b2be7d6bc3f27e6cec8c21bb1d7556537':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

9 years agoam 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"
Nick Kralevich [Mon, 27 Jul 2015 18:50:26 +0000 (18:50 +0000)]
am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"

* commit '73612fbbc99af331f0345479231538b5f0f2452e':
  ActivityManagerService: delete unnecessary mkdir

9 years agoam 4b3f6caf: am d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LO...
Fyodor Kupolov [Mon, 27 Jul 2015 18:47:25 +0000 (18:47 +0000)]
am 4b3f6caf: am d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

* commit '4b3f6caf9e443811c6d94f9c909249786dac614f':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION

9 years agoam 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels...
Chris Craik [Mon, 27 Jul 2015 18:47:19 +0000 (18:47 +0000)]
am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '5a70e76f40c19555a7ca09bd30a89b7bbaf985b5':
  Fix bitmap get/set pixels for ALPHA_8

9 years agoam 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status...
Phil Burk [Mon, 27 Jul 2015 18:47:14 +0000 (18:47 +0000)]
am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev

* commit '95e51b84454e41d2a54e845f57a73e8c3b54931d':
  MIDI: fix running status parser

9 years agoam 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1...
George Mount [Mon, 27 Jul 2015 18:41:43 +0000 (18:41 +0000)]
am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit '01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

9 years agoMerge "Clear selection when empty space is tapped."
Steve McKay [Mon, 27 Jul 2015 18:39:30 +0000 (18:39 +0000)]
Merge "Clear selection when empty space is tapped."

9 years agoam d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS...
Fyodor Kupolov [Mon, 27 Jul 2015 18:36:28 +0000 (18:36 +0000)]
am d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

* commit 'd815c04b12858340bb70d39d71a3e680643e8cdd':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION

9 years agoam 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8...
Chris Craik [Mon, 27 Jul 2015 18:36:22 +0000 (18:36 +0000)]
am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '53a82e35852a378709828482aa16f995e81660b9':
  Fix bitmap get/set pixels for ALPHA_8

9 years agoam 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into...
Phil Burk [Mon, 27 Jul 2015 18:36:15 +0000 (18:36 +0000)]
am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev

* commit '5821d548c6f2bdb33caa97978ac82f3b5385cdb9':
  MIDI: fix running status parser

9 years agoam 765fed14: am cd183953: am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invok...
Tim Volodine [Mon, 27 Jul 2015 18:35:51 +0000 (18:35 +0000)]
am 765fed14: am cd183953: am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

* commit '765fed146cf36322f7167187081091953632a59a':
  Revert "Invoke geolocation permissions callback with denied state by default."

9 years agoClear selection when empty space is tapped.
Steve McKay [Fri, 24 Jul 2015 20:14:20 +0000 (13:14 -0700)]
Clear selection when empty space is tapped.

Change-Id: I37f3ce8ec8d6b4c69a990ad129ff37229a8d2ac2

9 years agoam 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-previ...
George Mount [Mon, 27 Jul 2015 18:24:40 +0000 (18:24 +0000)]
am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit '1c964bece6ce1bbbf9f641d95df3bf2de01f6ab7':
  Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

9 years agoam d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATIO...
Fyodor Kupolov [Mon, 27 Jul 2015 18:19:02 +0000 (18:19 +0000)]
am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

* commit 'd7d1ea45984efdb6a514e97312045ac5b67ccb22':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION

9 years agoam cd183953: am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation...
Tim Volodine [Mon, 27 Jul 2015 18:19:02 +0000 (18:19 +0000)]
am cd183953: am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

* commit 'cd1839538f83b371716579b895bfadb1fda43dc9':
  Revert "Invoke geolocation permissions callback with denied state by default."

9 years agoam 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
Chris Craik [Mon, 27 Jul 2015 18:18:58 +0000 (18:18 +0000)]
am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '520a5c5670ef5c01dc73d4bfa46372414b2b85aa':
  Fix bitmap get/set pixels for ALPHA_8

9 years agoam 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
Phil Burk [Mon, 27 Jul 2015 18:18:54 +0000 (18:18 +0000)]
am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev

* commit '21fdbd91797dc026eacd1e057f94d1c2b1db6231':
  MIDI: fix running status parser

9 years agoam b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
Fyodor Kupolov [Mon, 27 Jul 2015 18:05:57 +0000 (18:05 +0000)]
am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

* commit 'b83b5fa641847ee1d533253ba5e1a3e13913b9d9':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION

9 years agoam 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions...
Tim Volodine [Mon, 27 Jul 2015 18:05:57 +0000 (18:05 +0000)]
am 15a4320e: am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

* commit '15a4320e731775163d5297ec20d031d9af4928d3':
  Revert "Invoke geolocation permissions callback with denied state by default."

9 years agoam 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
Chris Craik [Mon, 27 Jul 2015 18:05:53 +0000 (18:05 +0000)]
am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '4604c1dc67f634e1fac37f623f5b093615d49f0f':
  Fix bitmap get/set pixels for ALPHA_8

9 years agoam fef1b289: Merge "MIDI: fix running status parser" into mnc-dev
Phil Burk [Mon, 27 Jul 2015 18:05:48 +0000 (18:05 +0000)]
am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev

* commit 'fef1b28917df9a23b28ec5e5e7f83097b8574550':
  MIDI: fix running status parser

9 years agoRevert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
George Mount [Mon, 27 Jul 2015 17:38:22 +0000 (10:38 -0700)]
Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

This reverts commit c571a9a1d026cbf262cf36a5348f99d1ca0ec835, reversing
changes made to a29cfefe2c157a28b256771b1dce4653d405dcf1.

This should fix the build break for LMP downstream branches.

Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17

9 years agoMerge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev
Fyodor Kupolov [Mon, 27 Jul 2015 17:27:02 +0000 (17:27 +0000)]
Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

9 years agoMerge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev
Chris Craik [Mon, 27 Jul 2015 17:23:52 +0000 (17:23 +0000)]
Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

9 years agoMerge "MIDI: fix running status parser" into mnc-dev
Phil Burk [Mon, 27 Jul 2015 17:15:04 +0000 (17:15 +0000)]
Merge "MIDI: fix running status parser" into mnc-dev

9 years agoam 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback...
Tim Volodine [Mon, 27 Jul 2015 17:14:01 +0000 (17:14 +0000)]
am 2f6d6742: am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

* commit '2f6d674256cde89008c4457998b70d27721cdc64':
  Revert "Invoke geolocation permissions callback with denied state by default."

9 years agoam 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state...
Tim Volodine [Mon, 27 Jul 2015 16:57:07 +0000 (16:57 +0000)]
am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

* commit '91b31b53127aafbf3ed34b98f405d6e750627050':
  Revert "Invoke geolocation permissions callback with denied state by default."

9 years agoMerge "Revert "Invoke geolocation permissions callback with denied state by default...
Tim Volodine [Mon, 27 Jul 2015 16:37:57 +0000 (16:37 +0000)]
Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

9 years agoRevert "Invoke geolocation permissions callback with denied state by default."
Tim Volodine [Thu, 23 Jul 2015 17:16:16 +0000 (17:16 +0000)]
Revert "Invoke geolocation permissions callback with denied state by default."

This reverts commit 954d1333c478d4dba6c9a0536510da4fd94c0622.

The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046

Bug: 22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
(cherry picked from commit 0bb7d2e46710932d09688a18d4c5836f9b1413a5)

9 years agoam 0ec20e2c: am ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am...
George Mount [Mon, 27 Jul 2015 15:54:25 +0000 (15:54 +0000)]
am 0ec20e2c: am ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit '0ec20e2cabbb369119c08ac4b7f51018cc69e2ed':
  Update data binding for RC1.

9 years agoam c8f7311a: (-s ours) am 5fea0488: (-s ours) am 457b283e: (-s ours) am aedc09fb...
George Mount [Mon, 27 Jul 2015 15:54:19 +0000 (15:54 +0000)]
am c8f7311a: (-s ours) am 5fea0488: (-s ours) am 457b283e: (-s ours) am aedc09fb: (-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 'c8f7311abcc08d4517e56d5031a061f33ed7c318':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge...
George Mount [Mon, 27 Jul 2015 15:42:07 +0000 (15:42 +0000)]
am ec25318a: am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit 'ec25318a128f890ae6149c9d59a59779c81e5b2c':
  Update data binding for RC1.

9 years agoam 5fea0488: (-s ours) am 457b283e: (-s ours) am aedc09fb: (-s ours) am c0231f26...
George Mount [Mon, 27 Jul 2015 15:42:02 +0000 (15:42 +0000)]
am 5fea0488: (-s ours) am 457b283e: (-s ours) am aedc09fb: (-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 '5fea04886d9bf5ada35bbdd540ffd942050de5cc':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data...
George Mount [Mon, 27 Jul 2015 15:28:38 +0000 (15:28 +0000)]
am 931aaefd: am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit '931aaefd753a7975acf0c71bc45bd9d746fee131':
  Update data binding for RC1.

9 years agoam 457b283e: (-s ours) am aedc09fb: (-s ours) am c0231f26: (-s ours) am a29cfefe...
George Mount [Mon, 27 Jul 2015 15:28:33 +0000 (15:28 +0000)]
am 457b283e: (-s ours) am aedc09fb: (-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 '457b283e170d7ef7d56821065c71792398fa7cb3':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for...
George Mount [Mon, 27 Jul 2015 15:16:33 +0000 (15:16 +0000)]
am d7ecca5b: am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit 'd7ecca5b1c83deb820b6305121a0e016a88b763f':
  Update data binding for RC1.

9 years agoam aedc09fb: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a...
George Mount [Mon, 27 Jul 2015 15:16:29 +0000 (15:16 +0000)]
am aedc09fb: (-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 'aedc09fb88dc81a25c5d7b3b474ca112960d740c':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into...
George Mount [Mon, 27 Jul 2015 15:02:38 +0000 (15:02 +0000)]
am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit '9c450936aad92920215d2bc52d2c9ce132a55432':
  Update data binding for RC1.

9 years agoam c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT...
George Mount [Mon, 27 Jul 2015 15:02:35 +0000 (15:02 +0000)]
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 'c0231f26fe9ba13c3facb6caf42e53bae261654c':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:49:16 +0000 (14:49 +0000)]
am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit 'c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
  Update data binding for RC1.

9 years agoam a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data...
George Mount [Mon, 27 Jul 2015 14:49:11 +0000 (14:49 +0000)]
am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

* commit 'a29cfefe2c157a28b256771b1dce4653d405dcf1':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam 924319c2: (-s ours) am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53...
Geoff Mendal [Mon, 27 Jul 2015 14:42:45 +0000 (14:42 +0000)]
am 924319c2: (-s ours) am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '924319c2e5bd09a95685ef10bb2eb8b15ad07e58':
  Import translations. DO NOT MERGE

9 years agoam 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:35:50 +0000 (14:35 +0000)]
am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit '6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
  Update data binding for RC1.

9 years agoam 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javado...
George Mount [Mon, 27 Jul 2015 14:35:45 +0000 (14:35 +0000)]
am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

* commit '95e6ae3ad1ba8647494f0b5007b7beee76493e03':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.

9 years agoam 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import...
Geoff Mendal [Mon, 27 Jul 2015 14:29:09 +0000 (14:29 +0000)]
am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '855184113cfd367c7b4d5700bf342ad9141e988e':
  Import translations. DO NOT MERGE

9 years agoMerge "Update data binding for RC1." into mnc-preview-docs
George Mount [Mon, 27 Jul 2015 14:24:34 +0000 (14:24 +0000)]
Merge "Update data binding for RC1." into mnc-preview-docs

9 years agoMerge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview...
George Mount [Mon, 27 Jul 2015 14:24:17 +0000 (14:24 +0000)]
Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

9 years agoam 9fca530e: am 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interr...
Chris Wren [Mon, 27 Jul 2015 14:15:32 +0000 (14:15 +0000)]
am 9fca530e: am 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit '9fca530e3f4491efb5945a2eae44d0899710410b':
  decide interruptions based on current data, not previous data.

9 years agoam a3a53c6b: am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker...
Chris Wren [Mon, 27 Jul 2015 14:15:25 +0000 (14:15 +0000)]
am a3a53c6b: am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev

* commit 'a3a53c6b409ada4aba84ffe25c2d6e891ec47a37':
  add ticker to enqueue message for easier debugging

9 years agoam 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 27 Jul 2015 14:14:27 +0000 (14:14 +0000)]
am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

9 years agoam 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based...
Chris Wren [Mon, 27 Jul 2015 14:02:27 +0000 (14:02 +0000)]
am 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit '7339ed18978ae640a8ac053053459e1ef8c6bc8d':
  decide interruptions based on current data, not previous data.

9 years agoam 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue...
Chris Wren [Mon, 27 Jul 2015 14:02:22 +0000 (14:02 +0000)]
am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev

* commit '447009e3b014e8e9cc591c448064493ca22352f9':
  add ticker to enqueue message for easier debugging

9 years agoam 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 27 Jul 2015 14:02:12 +0000 (14:02 +0000)]
am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '4cd6da535a0b9a5938164edaa1a482a3c9f1ddf6':
  Import translations. DO NOT MERGE

9 years agoMerge "Change from SkDeviceProperties to SkSurfaceProps."
Derek Sollenberger [Mon, 27 Jul 2015 13:51:32 +0000 (13:51 +0000)]
Merge "Change from SkDeviceProperties to SkSurfaceProps."

9 years agoMerge "switch to new signature for NewWithProc"
Derek Sollenberger [Mon, 27 Jul 2015 13:51:32 +0000 (13:51 +0000)]
Merge "switch to new signature for NewWithProc"

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 27 Jul 2015 13:48:16 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

9 years agoam 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current...
Chris Wren [Mon, 27 Jul 2015 13:48:16 +0000 (13:48 +0000)]
am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit '5f181efd820c0554a071dd57b027ca35aa5b974f':
  decide interruptions based on current data, not previous data.

9 years agoam eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easie...
Chris Wren [Mon, 27 Jul 2015 13:48:09 +0000 (13:48 +0000)]
am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev

* commit 'eae9d6dae32ac01ac2ba0959eef0858a8c919c19':
  add ticker to enqueue message for easier debugging

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 13:44:06 +0000 (06:44 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not...
Chris Wren [Mon, 27 Jul 2015 13:35:51 +0000 (13:35 +0000)]
am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit 'fdc283e9231ad6f396441ccf4b50f46d151b28eb':
  decide interruptions based on current data, not previous data.

9 years agoam 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging...
Chris Wren [Mon, 27 Jul 2015 13:35:47 +0000 (13:35 +0000)]
am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev

* commit '3dad6c661f76b69475bb38b950d74f5de3bb8a8f':
  add ticker to enqueue message for easier debugging

9 years agoam 11f4cb1b: Merge "decide interruptions based on current data, not previous data...
Chris Wren [Mon, 27 Jul 2015 13:21:39 +0000 (13:21 +0000)]
am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit '11f4cb1bccf47a0e985be6948f30709ba40f4522':
  decide interruptions based on current data, not previous data.

9 years agoam 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
Chris Wren [Mon, 27 Jul 2015 13:21:35 +0000 (13:21 +0000)]
am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev

* commit '45a0bb18fec5b137a540e160cecd4ffd091098d9':
  add ticker to enqueue message for easier debugging

9 years agoMerge "decide interruptions based on current data, not previous data." into mnc-dev
Chris Wren [Mon, 27 Jul 2015 13:10:11 +0000 (13:10 +0000)]
Merge "decide interruptions based on current data, not previous data." into mnc-dev

9 years agoMerge "add ticker to enqueue message for easier debugging" into mnc-dev
Chris Wren [Mon, 27 Jul 2015 13:09:15 +0000 (13:09 +0000)]
Merge "add ticker to enqueue message for easier debugging" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 12:45:24 +0000 (05:45 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Implement openDevice/closeDevice method of MtpManager."
Daichi Hirono [Mon, 27 Jul 2015 07:01:49 +0000 (07:01 +0000)]
Merge "Implement openDevice/closeDevice method of MtpManager."

9 years agoMerge "Add openDevice and closeDevice methods to MtpDocumentsProvider."
Daichi Hirono [Mon, 27 Jul 2015 07:00:56 +0000 (07:00 +0000)]
Merge "Add openDevice and closeDevice methods to MtpDocumentsProvider."

9 years agoam 05cf335f: am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to...
Erik Kline [Mon, 27 Jul 2015 06:09:09 +0000 (06:09 +0000)]
am 05cf335f: am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

* commit '05cf335fc4e9cd50ddac809a47bb59ca459cc67e':
  Change to connectivitycheck.gstatic.com

9 years agoam 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitychec...
Erik Kline [Mon, 27 Jul 2015 05:59:10 +0000 (05:59 +0000)]
am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

* commit '04159d0b8ea468947cdb349be007f99ba25baa92':
  Change to connectivitycheck.gstatic.com

9 years agoam f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic...
Erik Kline [Mon, 27 Jul 2015 05:40:12 +0000 (05:40 +0000)]
am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

* commit 'f0927733a31a95d88c32d2e41f40f1873361856b':
  Change to connectivitycheck.gstatic.com

9 years agoam 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
Erik Kline [Mon, 27 Jul 2015 05:23:23 +0000 (05:23 +0000)]
am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

* commit '8c54a8e8c7f40037ac871d27e0a800e9c271fae9':
  Change to connectivitycheck.gstatic.com

9 years agoam a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
Erik Kline [Mon, 27 Jul 2015 04:32:19 +0000 (04:32 +0000)]
am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

* commit 'a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b':
  Change to connectivitycheck.gstatic.com

9 years agoMerge "Change to connectivitycheck.gstatic.com" into mnc-dev
Erik Kline [Mon, 27 Jul 2015 02:35:09 +0000 (02:35 +0000)]
Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

9 years agoam e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"
Nick Kralevich [Sun, 26 Jul 2015 04:39:19 +0000 (04:39 +0000)]
am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"

* commit 'e942b4596a12685cb722ddef4e59e279e6fd513f':
  ActivityManagerService: delete unnecessary mkdir

9 years agoMerge "ActivityManagerService: delete unnecessary mkdir"
Nick Kralevich [Sun, 26 Jul 2015 04:25:56 +0000 (04:25 +0000)]
Merge "ActivityManagerService: delete unnecessary mkdir"

9 years agoActivityManagerService: delete unnecessary mkdir
Nick Kralevich [Sun, 26 Jul 2015 04:12:09 +0000 (21:12 -0700)]
ActivityManagerService: delete unnecessary mkdir

/data/anr is now created in init.rc. This code is unnecessary.

Bug: 22385254
Change-Id: Ide6c9749c27668523f9316049a1d40d961f2276d

9 years agoFollow refactoring when enforcing permissions.
Jeff Sharkey [Sat, 25 Jul 2015 17:39:54 +0000 (10:39 -0700)]
Follow refactoring when enforcing permissions.

Change-Id: I3fd245622a7f1183cbe21e61f7604c8195022e69

9 years agoam 87431eea: (-s ours) am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d...
Geoff Mendal [Sat, 25 Jul 2015 16:48:28 +0000 (16:48 +0000)]
am 87431eea: (-s ours) am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '87431eeac9c72854ff56727100ff3882ffdca3ce':
  Import translations. DO NOT MERGE

9 years agoam aec2c787: (-s ours) am fab538f9: (-s ours) am 12d1d989: (-s ours) am 213e0c1d...
Geoff Mendal [Sat, 25 Jul 2015 16:48:22 +0000 (16:48 +0000)]
am aec2c787: (-s ours) am fab538f9: (-s ours) am 12d1d989: (-s ours) am 213e0c1d: (-s ours) Import translations. DO NOT MERGE

* commit 'aec2c787a5234327377cb8f07cbee9407f13b52e':
  Import translations. DO NOT MERGE

9 years agoam 43b379e7: am 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check...
Jeff Sharkey [Sat, 25 Jul 2015 16:48:14 +0000 (16:48 +0000)]
am 43b379e7: am 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev

* commit '43b379e72be58fca50af64092f5c99463d76d65b':
  Also check app-ops on path-permissions.

9 years agoam a69f8531: am fd89d2a0: am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake...
Selim Cinek [Sat, 25 Jul 2015 16:48:06 +0000 (16:48 +0000)]
am a69f8531: am fd89d2a0: am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

* commit 'a69f8531185e0238d173c574bc7e10c43a8a9d0a':
  Fixed wake to unlock when the device has never been unlocked

9 years agoam 9fd390c6: am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display
Jorim Jaggi [Sat, 25 Jul 2015 16:47:58 +0000 (16:47 +0000)]
am 9fd390c6: am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display

* commit '9fd390c6b998eea2795a20ef0ff9f88018e03a4f':
  Fix ambient display

9 years agoam 6593daa3: am a758499e: am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats...
Adam Lesinski [Sat, 25 Jul 2015 16:47:49 +0000 (16:47 +0000)]
am 6593daa3: am a758499e: am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev

* commit '6593daa39eaf71785cdf68f3899b69f8f6010046':
  BatteryStats: Decode wakeup reasons in Java

9 years agoam 25fcf199: am e756d912: am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the...
Selim Cinek [Sat, 25 Jul 2015 16:47:40 +0000 (16:47 +0000)]
am 25fcf199: am e756d912: am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev

* commit '25fcf1994c24954d34608ade2ee8fb2212e5e9d1':
  Adapted the behavior when unlocking with fingerprint is not allowed

9 years agoam 0e23c2b7: am 6331c6ca: am a62f3ee8: am 67b4db0c: am c174de0a: am 5442932a: am...
Chris Banes [Sat, 25 Jul 2015 16:47:32 +0000 (16:47 +0000)]
am 0e23c2b7: am 6331c6ca: am a62f3ee8: am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs

* commit '0e23c2b7da91549546de2c8d14f5f49cd0312781':
  v22.2.1 support api diff

9 years agoam c39e2a76: am 68db46ff: am 4fd4f4b4: am 047b2bfd: am 384b5d20: am a65de4fd: am...
Adrian Roos [Sat, 25 Jul 2015 16:47:21 +0000 (16:47 +0000)]
am c39e2a76: am 68db46ff: am 4fd4f4b4: am 047b2bfd: am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI

* commit 'c39e2a76d9bcb6baac7587988f4d7aa8d6bd603f':
  Prevent insanely long passwords from crashing SystemUI

9 years agoam 2a548609: am f43f6c5a: am aad38f60: am 50aded0c: am 68fbd6a4: Merge "Use process...
John Reck [Sat, 25 Jul 2015 16:47:12 +0000 (16:47 +0000)]
am 2a548609: am f43f6c5a: am aad38f60: am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev

* commit '2a5486090f06e7caaf7dec3e885bbc2a48a877da':
  Use process state to filter >= UI_HIDDEN

9 years agoam 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import...
Geoff Mendal [Sat, 25 Jul 2015 16:36:58 +0000 (16:36 +0000)]
am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '08f5cd338566d5bab06003eadf29156bd6367690':
  Import translations. DO NOT MERGE

9 years agoam fab538f9: (-s ours) am 12d1d989: (-s ours) am 213e0c1d: (-s ours) Import translati...
Geoff Mendal [Sat, 25 Jul 2015 16:36:51 +0000 (16:36 +0000)]
am fab538f9: (-s ours) am 12d1d989: (-s ours) am 213e0c1d: (-s ours) Import translations. DO NOT MERGE

* commit 'fab538f99b251c368b7c1f39453d9cd7553fad6d':
  Import translations. DO NOT MERGE

9 years agoam 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on...
Jeff Sharkey [Sat, 25 Jul 2015 16:36:43 +0000 (16:36 +0000)]
am 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev

* commit '43ff3afe1371cc8ec56754a1c06e7ed7573b770b':
  Also check app-ops on path-permissions.

9 years agoam fd89d2a0: am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when...
Selim Cinek [Sat, 25 Jul 2015 16:36:37 +0000 (16:36 +0000)]
am fd89d2a0: am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

* commit 'fd89d2a07a642aeb75930ba3595ee0be8795b360':
  Fixed wake to unlock when the device has never been unlocked

9 years agoam 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display
Jorim Jaggi [Sat, 25 Jul 2015 16:36:30 +0000 (16:36 +0000)]
am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display

* commit '5efe21e4bfb585a4fb3759c9b5c13b6cf5caba81':
  Fix ambient display