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

49958 Commits

Author SHA1 Message Date
Alan Viverette
4f53b0ecc4 am 42f9a5a6: am 32bc28f4: am aeaa396c: Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 
* commit '42f9a5a6b74211b10927d8e95a04cd6a80efdd6d':
  Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
 2015-06-23 03:04:19 +00:00
Alan Viverette
42f9a5a6b7 am 32bc28f4: am aeaa396c: Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 
* commit '32bc28f4c33e0dc5c33c4bae6ff084b344f90324':
  Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""
 2015-06-23 02:53:11 +00:00
Rahul Chaturvedi
8ee0c2cf24 Merge "Add binder transaction tracking." 2015-06-22 23:55:09 +00:00
Alan Viverette
aeaa396cae Merge "Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""" into mnc-dev 2015-06-22 22:38:09 +00:00
Alan Viverette
9554f9fc9e Revert "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" 
Turns out this was actually fine.

This reverts commit 9355533bf6.

Change-Id: I30c66fd423b569958244685098511d4ba08fbf37
 2015-06-22 22:37:58 +00:00
Matthew Williams
0272474379 am 9ac21d4c: am 1a9245d5: am 8b1db074: Merge "Cancel Syncs that aren\'t making progress." into mnc-dev 
* commit '9ac21d4cf8d0870d7f452665fa110e1aba356f89':
  Cancel Syncs that aren't making progress.
 2015-06-22 22:22:59 +00:00
Matthew Williams
9ac21d4cf8 am 1a9245d5: am 8b1db074: Merge "Cancel Syncs that aren\'t making progress." into mnc-dev 
* commit '1a9245d568640301483bf10618081ddf42b9c0cc':
  Cancel Syncs that aren't making progress.
 2015-06-22 22:09:14 +00:00
Jeff Sharkey
0e5e4eea5e am 4edfd64b: am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev 
* commit '4edfd64bc1c69be3107fe924772331c1a974e28c':
  Forget private partition keys.
 2015-06-22 21:57:08 +00:00
Alan Viverette
8adf480f06 am 7f6da50d: am 823f51f3: am 696d2149: Merge "Match default color packing for captioning settings" into mnc-dev 
* commit '7f6da50d438753c57b6a408e59868fad3a4a89e1':
  Match default color packing for captioning settings
 2015-06-22 21:56:51 +00:00
Matthew Williams
8b1db0746f Merge "Cancel Syncs that aren't making progress." into mnc-dev 2015-06-22 21:41:49 +00:00
Matthew Williams
1967c8ddd5 Cancel Syncs that aren't making progress. 
BUG: 18266674
1) If a sync has up/downloaded less than 10bytes in 60 seconds it is
considered to be making no progress and is summarily cancelled.

2) Apply a 30min hard time-out to initialization syncs.

Note that there is little proof that cancelling a sync has an
impact. All it results in is a Thread.interrupt on the sync
thread, which the adapter must itself implement. To this effect
this CL also updates the javadoc to make this clearer, and adds
some (unimplemented) threats about killing the hosting process.

Change-Id: I83c447648152ccbf76bb1fbd7e9216e01a37952f
 2015-06-22 14:36:36 -07:00
Jeff Sharkey
4edfd64bc1 am 421daf85: am c629271d: Merge "Forget private partition keys." into mnc-dev 
* commit '421daf8590cdbce7e41b7492608a985fe13c2033':
  Forget private partition keys.
 2015-06-22 21:33:44 +00:00
Alan Viverette
7f6da50d43 am 823f51f3: am 696d2149: Merge "Match default color packing for captioning settings" into mnc-dev 
* commit '823f51f3a2dcba1a0d509eab66b7ba330fddecea':
  Match default color packing for captioning settings
 2015-06-22 21:13:38 +00:00
Jeff Sharkey
c629271d48 Merge "Forget private partition keys." into mnc-dev 2015-06-22 21:09:52 +00:00
Jeff Sharkey
5cc0df214b Forget private partition keys. 
When we forget a private partition, ask vold to also forget the key
for that partition GUID.  This means we need to track both the
filesystem UUID and the partition GUID for a private volume.

Bug: 21782268
Change-Id: Icda1cbb65539d61dacc663428daf3d1a2e4c313e
 2015-06-22 14:07:10 -07:00
Alan Viverette
696d214946 Merge "Match default color packing for captioning settings" into mnc-dev 2015-06-22 20:55:12 +00:00
Rahul Chaturvedi
52613f9084 Add binder transaction tracking. 
Add the ability to am to be able to track binder transact calls. This
will help us diagnose excessive IPC calls.

This CL adds the trace-ip command to am. The usage is,

To start binder transaction tracking,
am trace-ipc start
To stop tracking and dump the data to a file,
am trace-ipc stop --dump-file <FILE>

Bug: 21398706
Change-Id: Ic0c9b3be757dd0662a2750a0d8447e2a5ef1fa90
 2015-06-22 16:28:24 -04:00
Alan Viverette
7e4019b741 Match default color packing for captioning settings 
"Default" packed colors are indicated by zero alpha and non-zero
red/blue. The cached alpha value used by Settings is stored in green.

Bug: 21602597
Change-Id: I1465210fda854ee979aa3a6b398ae60b41d10711
 2015-06-22 13:06:24 -07:00
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