Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,641 Commits 3 Branches 0 Tags
e689cca19c0f709b2047dcbc52cfd30cb74509b3
Commit Graph

49940 Commits

Author SHA1 Message Date
Jeff Brown
e689cca19c am 3a9f86a2: am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '3a9f86a2df00973b10754fa4011b8e8c32928685':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 20:01:41 +00:00
Jeff Brown
3a9f86a2df am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '6903187a2f3b54ce40239071d6f3a8bafd396ea9':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 19:51:11 +00:00
Jeff Brown
d63c721e71 Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 2015-06-22 19:29:32 +00:00
Selim Gurun
885e30fd83 am e0d181e3: am ac7b7015: am 7c781124: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'e0d181e33175eed361c3fef3552d3c861b4da3eb':
  Clarify handling client certificates
 2015-06-22 18:28:21 +00:00
Selim Gurun
e0d181e331 am ac7b7015: am 7c781124: Merge "Clarify handling client certificates" into mnc-dev 
* commit 'ac7b7015e062dc410f59ed5e6bce6c38fcaeeb95':
  Clarify handling client certificates
 2015-06-22 18:19:53 +00:00
Kenny Guy
bf190b2ebb am 38914619: am 32327b72: am 43423549: Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 
* commit '389146190e1d391a91871f07518be755d01d31de':
  Fix LauncherApps registerCallback adding duplicate callbacks.
 2015-06-22 18:13:52 +00:00
Julia Reynolds
762bee92f6 am 8ce3cd35: am 6286a6a8: am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit '8ce3cd3562f4d3f8d4484228a7d53de2d51687bf':
  Hide device initializer methods/fields.
 2015-06-22 18:13:46 +00:00
Selim Gurun
7c78112476 Merge "Clarify handling client certificates" into mnc-dev 2015-06-22 17:55:29 +00:00
Kenny Guy
389146190e am 32327b72: am 43423549: Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 
* commit '32327b7256cf4ab321ee9906837fb25dd1d39ab4':
  Fix LauncherApps registerCallback adding duplicate callbacks.
 2015-06-22 17:08:16 +00:00
Julia Reynolds
8ce3cd3562 am 6286a6a8: am d66559f2: Merge "Hide device initializer methods/fields." into mnc-dev 
* commit '6286a6a85bc7a8d959d640191b098c723a427bcd':
  Hide device initializer methods/fields.
 2015-06-22 17:08:12 +00:00
Selim Gurun
a679ac59a1 Clarify handling client certificates 
Bug: 21910771

Clarify handling client certificates when using a webview. This is a
documentation change only.

Change-Id: Ida78bd89aa8867c99b4b9e4433e342767e9bac0d
 2015-06-22 10:04:01 -07:00
Kenny Guy
434235496c Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 2015-06-22 16:50:05 +00:00
Julia Reynolds
d66559f26d Merge "Hide device initializer methods/fields." into mnc-dev 2015-06-22 16:41:42 +00:00
Derek Sollenberger
82064fcab4 am 87c5a508: am f1c031d5: am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 
* commit '87c5a5088e555fb3bbd5f28f1eb85a0596d36250':
  Enable Picture w/ HW Accelerated Canvas.
 2015-06-22 16:07:14 +00:00
Derek Sollenberger
87c5a5088e am f1c031d5: am b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 
* commit 'f1c031d512fd8596e40b8a5832441869ab831e48':
  Enable Picture w/ HW Accelerated Canvas.
 2015-06-22 15:59:37 +00:00
Derek Sollenberger
b2aea9dcbd Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev 2015-06-22 15:38:11 +00:00
Andrei Stingaceanu
ec9e10b74d am 4ca5725f: am 76d2204d: am b1891b3f: Fix selection by double tap in Extracted mode 
* commit '4ca5725f95e613a9550f77e4ec155432141a8095':
  Fix selection by double tap in Extracted mode
 2015-06-22 13:36:36 +00:00
Andrei Stingaceanu
4ca5725f95 am 76d2204d: am b1891b3f: Fix selection by double tap in Extracted mode 
* commit '76d2204d2b4d42f11222eb68f0058b6c3bae6e10':
  Fix selection by double tap in Extracted mode
 2015-06-22 13:24:22 +00:00
Derek Sollenberger
e109940d81 Enable Picture w/ HW Accelerated Canvas. 
Bug: 20688645
Change-Id: I664f37d6dbb3e61b17206c82ebcc63f988cefc65
 2015-06-22 13:18:29 +00:00
Andrei Stingaceanu
b1891b3fc9 Fix selection by double tap in Extracted mode 
Select with double tap in extracted mode has suffered
a regression recently: flickers and it does not correctly
select. Found this fix after a lot of trials.

Bug: 20128047
Change-Id: I1bbe8c11982d37e5409bac2b648a31b0ca1f0bbc
 2015-06-22 12:42:06 +01:00
Vladislav Kaznacheev
0796f25c0a am 86578bee: am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 
* commit '86578bee880d33ac40bb002ffc717e471acda754':
  Fix huge bounce-back in ListView when double-flinging
 2015-06-22 09:59:01 +00:00
Vladislav Kaznacheev
86578bee88 am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 
* commit '01acdd9feaa1dfe32863b667dd9300240bbc3db7':
  Fix huge bounce-back in ListView when double-flinging
 2015-06-22 09:46:30 +00:00
Vladislav Kaznacheev
8228e4247c Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev 2015-06-22 09:30:20 +00:00
Bart Sears
2f97ec825f am 48f94aac: am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev 
* commit '48f94aac65e09504f85b2cd12492145e266b488c':
  Revert "Clarify handling client certificates"
 2015-06-20 05:59:09 +00:00
Bart Sears
48f94aac65 am 1b96f013: am 950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev 
* commit '1b96f013a02409195278be23a19d57289f26c7fe':
  Revert "Clarify handling client certificates"
 2015-06-20 05:46:13 +00:00
Paul Jensen
6e940c659c am 2e2cc43e: am ae6d0354: am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 
* commit '2e2cc43e3353ca433fc7f85521102cb138faeb65':
  Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
 2015-06-20 05:43:50 +00:00
Bart Sears
950aa197d4 Merge "Revert "Clarify handling client certificates"" into mnc-dev 2015-06-20 05:22:39 +00:00
Bart Sears
4ead33300f Revert "Clarify handling client certificates" 
CL broke the javadoc build.

This reverts commit 36cf701e1e.

Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
 2015-06-20 05:21:38 +00:00
Paul Jensen
2e2cc43e33 am ae6d0354: am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 
* commit 'ae6d0354677221fb988a76f2f26c064c167283da':
  Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
 2015-06-20 01:33:24 +00:00
Paul Jensen
2f56a33041 Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev 2015-06-20 01:13:18 +00:00
Doris Liu
11f80da4a0 am ec92ea39: am 5bfdb772: am 4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev 
* commit 'ec92ea3946311e177d5eeb14a5c6f885ca5311de':
  Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
 2015-06-20 01:00:39 +00:00
Doris Liu
ec92ea3946 am 5bfdb772: am 4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev 
* commit '5bfdb772f68256480fbcbb5161bb079b60f2d8bf':
  Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
 2015-06-20 00:47:12 +00:00
Jeff Brown
6a8bd7bc13 Repurpose doze wake lock stats for draw wake lock instead. 
The doze wake lock is an internal implementation detail with no
power impact.  However the draw wake lock is much more interesting
to track because it's essentially like a special purpose partial
wake lock which may be acquired while dozing.

Bug: 21949905
Change-Id: Iedd5f366eb010a47a9691374c5cd3d85ea68173d
 2015-06-19 17:27:21 -07:00
Doris Liu
4a79992591 Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev 2015-06-20 00:23:30 +00:00
Svet Ganov
971e091d52 am 27479b57: am f5da7202: am 1e575a0f: Merge "Only grant runtime permissions to special components." into mnc-dev 
* commit '27479b5752bcb06853ef5ada1813dc139efb7dd0':
  Only grant runtime permissions to special components.
 2015-06-20 00:11:52 +00:00
Amith Yamasani
0c25fbde82 resolved conflicts for merge of 5f1c2dbc to master 
Change-Id: I4d08ad224c8cddd1d379c0f9ec326165a08dd651
 2015-06-19 17:04:02 -07:00
Doris Liu
bcfdead943 Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice 
The issue states that NumberPicker.setWrapSelectorWheel(false) only works
in a specific call order. The underlying problem is that NumberPicker
does not remember user's preference on whether the selector wheel should
be wrapped. Therefore, it only works when user sets their preference last,
after everything else that could affect the choice gets executed.

Bug: 19049714
Change-Id: Ic27d909cb3dd657993a4df9a04c819b6965ad11b
 2015-06-19 16:33:39 -07:00
Svet Ganov
27479b5752 am f5da7202: am 1e575a0f: Merge "Only grant runtime permissions to special components." into mnc-dev 
* commit 'f5da72021b1855cc6b6b5819b4611152fdc968c4':
  Only grant runtime permissions to special components.
 2015-06-19 22:48:29 +00:00
Amith Yamasani
5f1c2dbcfd am 97d2493f: am b94761d0: Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev 
* commit '97d2493f1a737158f489f4ff9e38e5c19f798bde':
  App Standby : Association between content providers and their sync adapter
 2015-06-19 22:28:24 +00:00
Svet Ganov
1e575a0f32 Merge "Only grant runtime permissions to special components." into mnc-dev 2015-06-19 22:26:32 +00:00
Svet Ganov
adc1cf4604 Only grant runtime permissions to special components. 
Now runtime permissions are granted only to components that are
part of the system or perform special system operations. For
exmple, the shell UID gets its runtime permissions granted by
default and the default phone app gets the phone permissions
granted by default.

bug:21764803

Change-Id: If8b8cadbd1980ffe7a6fc15bbb5f54a425f6e8f9
 2015-06-19 15:17:56 -07:00
Amith Yamasani
b94761d0a4 Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev 2015-06-19 22:08:13 +00:00
Amith Yamasani
37a40c24de App Standby : Association between content providers and their sync adapter 
Set sync adapters to active if the associated content providers are used
at foreground process state.

Minimize how frequently published content providers are reported by
keeping track of last reported time.

Also cache sync adapters associated with an authority in SyncManager.

Bug: 21785111
Change-Id: Ic2c8cb6a27f005d1a1d0aad21d36b1510160753a
 2015-06-19 15:04:58 -07:00
Adam Lesinski
d28292f319 am 52e7f8c7: am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev 
* commit '52e7f8c76f78176ae33c22118e2f05626923c724':
  BatteryStats: Record doze wake locks
 2015-06-19 21:48:37 +00:00
Yorke Lee
abe4a67612 am aad6327d: am 495cac60: am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev 
* commit 'aad6327d3b619e8b34305fefba81010e21bc5eef':
  Don't save cached contact info in call log when adding call
 2015-06-19 21:40:32 +00:00
Chien-Yu Chen
a8f75863f7 am ae599fa0: am befbd422: am be2e38e0: Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 
* commit 'ae599fa05986863d188055b8d0c568d6097091b3':
  ImageReader: Fix format workarounds for legacy devices
 2015-06-19 21:40:09 +00:00
Adam Lesinski
52e7f8c76f am bd9b25ef: am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev 
* commit 'bd9b25efb8cdaa4772f730259418d66ba58beb40':
  BatteryStats: Record doze wake locks
 2015-06-19 21:39:57 +00:00
Yorke Lee
aad6327d3b am 495cac60: am c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev 
* commit '495cac604d3c935fe23e0d73be5a750528106e41':
  Don't save cached contact info in call log when adding call
 2015-06-19 21:23:27 +00:00
Chien-Yu Chen
ae599fa059 am befbd422: am be2e38e0: Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev 
* commit 'befbd42211c8d47c02f08db107f9bc18be8576c6':
  ImageReader: Fix format workarounds for legacy devices
 2015-06-19 21:22:58 +00:00
Adam Lesinski
b6a092990c Merge "BatteryStats: Record doze wake locks" into mnc-dev 2015-06-19 21:13:43 +00:00