drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209,126 Commits 1 Branch 0 Tags
Commit Graph

209126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
efbfd2ad8b 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"
 2015-07-27 19:18:34 +00:00
Jason Monk
fc2506255f Fix QS switch accessibility problem 
Set the switch state so it can be read back correctly.

Bug: 22710906
Change-Id: I2bcba96e53813118eb2be8dcb7e0b7d547767550
 2015-07-27 15:17:14 -04:00
Julia Reynolds
72f83d6a05 Allow Settings to set background data restrict on secondary users. 
Bug: 22721091
Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd
 2015-07-27 15:10:42 -04:00
Steve McKay
825324369a Improved files icon and activity label. 
Change-Id: I7df661b88ce859f94d5f0bbd6687950140cbf39d
 2015-07-27 12:03:26 -07:00
Nick Kralevich
aba7a0f3cb am fb2927df: am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir" 
* commit 'fb2927dfbc0b0cd43cad2be494ce46a9a447a6e7':
  ActivityManagerService: delete unnecessary mkdir
 2015-07-27 19:01:28 +00:00
Fyodor Kupolov
aaf1484851 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
 2015-07-27 19:01:21 +00:00
Chris Craik
8e1ae26bf1 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
 2015-07-27 19:01:14 +00:00
Phil Burk
f244b3aa97 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
 2015-07-27 19:01:07 +00:00
Jorim Jaggi
9e49b5d679 Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 2015-07-27 18:55:29 +00:00
George Mount
02730bab57 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"
 2015-07-27 18:55:00 +00:00
Nick Kralevich
fb2927dfbc am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir" 
* commit '73612fbbc99af331f0345479231538b5f0f2452e':
  ActivityManagerService: delete unnecessary mkdir
 2015-07-27 18:50:26 +00:00
Fyodor Kupolov
d1f1985f33 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
 2015-07-27 18:47:25 +00:00
Chris Craik
6c3fc22c62 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
 2015-07-27 18:47:19 +00:00
Phil Burk
4a30f4d864 am 95e51b84: am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit '95e51b84454e41d2a54e845f57a73e8c3b54931d':
  MIDI: fix running status parser
 2015-07-27 18:47:14 +00:00
Adam Lesinski
d7616ef73c BatteryStats: Prevent BatteryService from blocking 
BatteryService is a low level service, and we shouldn't have it
block in BatteryStatsService while collecting external data from
components like WiFi. Deadlocks can occur this way.

Bug:22559655
Change-Id: I64026453d191695eb583a47163ab6f48f882b085
 2015-07-27 11:43:05 -07:00
George Mount
da30e09b2b 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"
 2015-07-27 18:41:43 +00:00
Steve McKay
e74fff48a0 Merge "Clear selection when empty space is tapped." 2015-07-27 18:39:30 +00:00
Fyodor Kupolov
4b3f6caf9e 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
 2015-07-27 18:36:28 +00:00
Chris Craik
5a70e76f40 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
 2015-07-27 18:36:22 +00:00
Phil Burk
95e51b8445 am 5821d548: am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit '5821d548c6f2bdb33caa97978ac82f3b5385cdb9':
  MIDI: fix running status parser
 2015-07-27 18:36:15 +00:00
Tim Volodine
e7dca53477 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."
 2015-07-27 18:35:51 +00:00
Steve McKay
b04b1648c5 Clear selection when empty space is tapped. 
Change-Id: I37f3ce8ec8d6b4c69a990ad129ff37229a8d2ac2
 2015-07-27 11:25:25 -07:00
George Mount
01fe3f86b1 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"
 2015-07-27 18:24:40 +00:00
Fyodor Kupolov
d815c04b12 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
 2015-07-27 18:19:02 +00:00
Tim Volodine
765fed146c 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."
 2015-07-27 18:19:02 +00:00
Chris Craik
53a82e3585 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
 2015-07-27 18:18:58 +00:00
Phil Burk
5821d548c6 am 21fdbd91: am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit '21fdbd91797dc026eacd1e057f94d1c2b1db6231':
  MIDI: fix running status parser
 2015-07-27 18:18:54 +00:00
Fyodor Kupolov
d7d1ea4598 am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 
* commit 'b83b5fa641847ee1d533253ba5e1a3e13913b9d9':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
 2015-07-27 18:05:57 +00:00
Tim Volodine
cd1839538f 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."
 2015-07-27 18:05:57 +00:00
Chris Craik
520a5c5670 am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev 
* commit '4604c1dc67f634e1fac37f623f5b093615d49f0f':
  Fix bitmap get/set pixels for ALPHA_8
 2015-07-27 18:05:53 +00:00
Phil Burk
21fdbd9179 am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev 
* commit 'fef1b28917df9a23b28ec5e5e7f83097b8574550':
  MIDI: fix running status parser
 2015-07-27 18:05:48 +00:00
George Mount
1c964bece6 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
 2015-07-27 10:39:54 -07:00
Fyodor Kupolov
b83b5fa641 Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 2015-07-27 17:27:02 +00:00
Chris Craik
4604c1dc67 Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev 2015-07-27 17:23:52 +00:00
Phil Burk
fef1b28917 Merge "MIDI: fix running status parser" into mnc-dev 2015-07-27 17:15:04 +00:00
Tim Volodine
15a4320e73 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."
 2015-07-27 17:14:01 +00:00
Tim Volodine
2f6d674256 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."
 2015-07-27 16:57:07 +00:00
Tim Volodine
91b31b5312 Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev 2015-07-27 16:37:57 +00:00
Tim Volodine
4961105a7d 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)
 2015-07-27 16:20:29 +00:00
George Mount
853a5c7b64 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.
 2015-07-27 15:54:25 +00:00
George Mount
71576bddd0 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.
 2015-07-27 15:54:19 +00:00
George Mount
0ec20e2cab 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.
 2015-07-27 15:42:07 +00:00
George Mount
c8f7311abc 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.
 2015-07-27 15:42:02 +00:00
George Mount
ec25318a12 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.
 2015-07-27 15:28:38 +00:00
George Mount
5fea04886d 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.
 2015-07-27 15:28:33 +00:00
George Mount
931aaefd75 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.
 2015-07-27 15:16:33 +00:00
George Mount
457b283e17 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.
 2015-07-27 15:16:29 +00:00
George Mount
d7ecca5b1c am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit '9c450936aad92920215d2bc52d2c9ce132a55432':
  Update data binding for RC1.
 2015-07-27 15:02:38 +00:00
George Mount
aedc09fb88 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.
 2015-07-27 15:02:35 +00:00
George Mount
9c450936aa am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs 
* commit 'c571a9a1d026cbf262cf36a5348f99d1ca0ec835':
  Update data binding for RC1.
 2015-07-27 14:49:16 +00:00