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

114288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
1062559d43 am 2d91368a: am 2d94c573: Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 
* commit '2d91368aea75dbc195d07efc465a462a006a5753':
  Fix issue #11069176: Crash showing process stats
 2013-10-04 09:53:14 -07:00
Dianne Hackborn
2d91368aea am 2d94c573: Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 
* commit '2d94c57345ba3e837ef780de9dae172c3abd5ae8':
  Fix issue #11069176: Crash showing process stats
 2013-10-04 09:51:38 -07:00
Dianne Hackborn
2d94c57345 Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 2013-10-04 16:49:05 +00:00
Svetoslav
6077037abf am 2f6aabd7: am 5c126892: Merge "Print UI tweaks as per UX request." into klp-dev 
* commit '2f6aabd7c399377e4ea033e5882b71420737017c':
  Print UI tweaks as per UX request.
 2013-10-04 09:03:23 -07:00
Svetoslav
2f6aabd7c3 am 5c126892: Merge "Print UI tweaks as per UX request." into klp-dev 
* commit '5c126892ec53772d784fcf9cef9165acf1d92ce3':
  Print UI tweaks as per UX request.
 2013-10-04 09:00:52 -07:00
Svetoslav
5c126892ec Merge "Print UI tweaks as per UX request." into klp-dev 2013-10-04 15:58:10 +00:00
Eric Laurent
02f00de89f am 4b292317: am 15bcc2d8: Merge "audioservice: fix DTMF stream volume" into klp-dev 
* commit '4b292317f036d29fc0f44a20f312ebb538548981':
  audioservice: fix DTMF stream volume
 2013-10-04 08:25:35 -07:00
Eric Laurent
4b292317f0 am 15bcc2d8: Merge "audioservice: fix DTMF stream volume" into klp-dev 
* commit '15bcc2d82f1368ee4002b2eb6d652591dc2028af':
  audioservice: fix DTMF stream volume
 2013-10-04 08:23:07 -07:00
Eric Laurent
15bcc2d82f Merge "audioservice: fix DTMF stream volume" into klp-dev 2013-10-04 15:18:32 +00:00
Jonathan Dixon
3bd13f3a74 am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '6079dbc1ae0fe0c8c8d642d072514e1ea94d1ac5':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 07:23:05 -07:00
Jonathan Dixon
6079dbc1ae am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '050c552f096a6f8f2283162edcb9c6b015cfb3dd':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 07:20:49 -07:00
Jonathan Dixon
050c552f09 Fix CookieSyncManager for WebViewClassic 
Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager

This was collateral damage from the fixes for Bug 10932261

Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
 2013-10-04 14:23:47 +01:00
Jim Miller
84e0766cbe am 43bd3f24: am 3d61bf45: Merge "Replace searchlight asset" into klp-dev 
* commit '43bd3f2459642f38f88e9aa90a05a50ea21ba010':
  Replace searchlight asset
 2013-10-03 21:30:39 -07:00
Jim Miller
8995c51d1d am 3efc75ac: am fea784dd: Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 
* commit '3efc75acce4c77c5ef62e6ff6ac57410ec53bde7':
  Fix bug where dismiss() was being called from the wrong thread
 2013-10-03 21:30:35 -07:00
Adam Powell
bf7116a9dd am 049e663c: am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev 
* commit '049e663c3bedda1b86d9276eaf660ba8571e375b':
  Fix a bug in action menu measurement
 2013-10-03 21:30:32 -07:00
Wink Saville
e7329140c0 am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'fe587dba3a70c658140eac1b13996b7d8e6eeda2':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-03 21:30:29 -07:00
Vinit Deshapnde
c9ed4e98b8 am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev 
* commit '78624d61f1a138610bdbffe3d1c6ddf89f3472c8':
  Set P2p statemachine's network manager before starting Wifi
 2013-10-03 21:30:26 -07:00
Adam Powell
3a1abeac35 am cf51fefd: am c7c7f5b5: Merge "Fix docs" into klp-dev 
* commit 'cf51fefde37b0f786e6abdda700d49091fc36491':
  Fix docs
 2013-10-03 21:30:21 -07:00
Yuhao Zheng
d82800b890 am 4ee58568: am f3ca9477: Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev 
* commit '4ee58568b632c3374e54e84a3114592826241c5a':
  New Telephony APIs to return MMS UA and UAProfUrl
 2013-10-03 21:30:18 -07:00
Jim Miller
43bd3f2459 am 3d61bf45: Merge "Replace searchlight asset" into klp-dev 
* commit '3d61bf45e559e084fa173bd50e2e7d7286dc9a35':
  Replace searchlight asset
 2013-10-03 21:27:20 -07:00
Jim Miller
3efc75acce am fea784dd: Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 
* commit 'fea784ddec162951e95e91010b25ffb65fe704db':
  Fix bug where dismiss() was being called from the wrong thread
 2013-10-03 21:27:17 -07:00
Adam Powell
049e663c3b am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev 
* commit '8c5b15c628b89c4fb832b7311e5d13ccea4aff04':
  Fix a bug in action menu measurement
 2013-10-03 21:27:14 -07:00
Wink Saville
fe587dba3a am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'a48ccdd6fb671435ed2583830b2828450bfc3cde':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-03 21:27:11 -07:00
Vinit Deshapnde
78624d61f1 am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev 
* commit '5eb2b0ca76560cb8d707295aec42cb72f379eafe':
  Set P2p statemachine's network manager before starting Wifi
 2013-10-03 21:27:09 -07:00
Adam Powell
cf51fefde3 am c7c7f5b5: Merge "Fix docs" into klp-dev 
* commit 'c7c7f5b5d5346a31db87e98ad5214e8110f1846c':
  Fix docs
 2013-10-03 21:27:06 -07:00
Yuhao Zheng
4ee58568b6 am f3ca9477: Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev 
* commit 'f3ca947784571a554ef862e0e8ba01eff3cfa004':
  New Telephony APIs to return MMS UA and UAProfUrl
 2013-10-03 21:27:04 -07:00
Jim Miller
3d61bf45e5 Merge "Replace searchlight asset" into klp-dev 2013-10-04 02:26:56 +00:00
Jim Miller
d34de7304c Replace searchlight asset 
Fixes bug 11030712

Change-Id: Ia25dec35dd3a8d59f98521e579bc1d269518c395
 2013-10-03 19:20:58 -07:00
Jim Miller
fea784ddec Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 2013-10-04 02:18:42 +00:00
Jim Miller
6001379bff Fix bug where dismiss() was being called from the wrong thread 
One-way calls to binder do not guarantee the call will always
occur on the originating thread.  This fixes a rare case where
keyguard would crash due to dismiss() being called from the wrong
thread.

Fixes bug 11065316

Change-Id: Iddd281964231a152e3342e21b6b88527eab94caf
 2013-10-03 18:31:34 -07:00
Adam Powell
8c5b15c628 Merge "Fix a bug in action menu measurement" into klp-dev 2013-10-04 01:29:34 +00:00
Adam Powell
da9710806b Fix a bug in action menu measurement 
Thanks to a measurement optimization in KK, the view recycling
behavior of ActionMenuPresenter could get into a state where the
resulting ActionMenuView had changed but no layout was
requested. Explicitly request a layout during menu update. Also fix an
ancient typo.

Bug 11047996

Change-Id: I6289fd2d142ac7d2101fbec6de19b7d3d7fbd6a2
 2013-10-03 18:21:58 -07:00
Eric Laurent
24e0d9b6c4 audioservice: fix DTMF stream volume 
DTMF stream must also be muted by silent mode when following ring
stream volume in order to be properly muted and unmuted when ringer
mode changes.

Also fix a problem in VolumeStreamState.setAllIndexes() when some
devices are not present in the stream state from which indexes
are copied.

Bug: 10932676.
Change-Id: I373d0fd1a475980786d97d97348d46a7e7421461
 2013-10-03 18:15:07 -07:00
Wink Saville
a48ccdd6fb Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 2013-10-04 00:52:59 +00:00
Vinit Deshapnde
5eb2b0ca76 Merge "Set P2p statemachine's network manager before starting Wifi" into klp-dev 2013-10-04 00:40:32 +00:00
Dianne Hackborn
d94d533b5a Fix issue #11069176: Crash showing process stats 
Change-Id: Ie568ebcb9863bed95c775b9b28654a5e2dc464cd
 2013-10-03 17:32:19 -07:00
Adam Powell
c7c7f5b5d5 Merge "Fix docs" into klp-dev 2013-10-04 00:28:57 +00:00
Yuhao Zheng
f3ca947784 Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev 2013-10-04 00:14:18 +00:00
Adam Powell
70cb8021ef Fix docs 
Change-Id: I19e0cdab6c526f7eed376fc2067b5c49b31a3ea9
 2013-10-03 16:39:30 -07:00
Vinit Deshapnde
04675f6ae9 Set P2p statemachine's network manager before starting Wifi 
Wifi statemachine starts P2p statemachine; which uses network management
service to (i.e. netd) to start p2p0 interface. But it only gets a
reference to network management service in conenctivityServiceReady().
Calling that later means there's a chance of a race between this
thread's setting of the network manager, and P2p statemachine thread's
usage of the same.

Bug: 11048296
Change-Id: If151026ed5fbb12db57ee7f9bdd47c67dd7142e5
 2013-10-03 16:18:56 -07:00
Chet Haase
74cf145646 am f37696b7: am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev 
* commit 'f37696b70cb1219ce0a1a52eae597b8ddfe62a88':
  Fix lockscreen wave animation artifacts
 2013-10-03 16:14:23 -07:00
Chet Haase
f37696b70c am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev 
* commit '76a5c86df7902870c87ff07ffd0628cb10f32c00':
  Fix lockscreen wave animation artifacts
 2013-10-03 16:11:42 -07:00
Chet Haase
76a5c86df7 Merge "Fix lockscreen wave animation artifacts" into klp-dev 2013-10-03 23:08:23 +00:00
Adam Powell
91aa602187 am 310796de: am d6239b92: Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev 
* commit '310796de0b86074229ad804001b1ef8d466ee69c':
  Add a scrubber to keyguard; layout tweaks
 2013-10-03 15:51:26 -07:00
Chet Haase
167a32326e Fix lockscreen wave animation artifacts 
On some display sizes, the wave animation was sometimes
running more than once, starting over in the center and animating
outward... partially.

The problem was that the calculations determining the alpha value
of the dots was returning bogus values when the display area was
large enough, which is why the bug is only on some devices.

This fix simplifies the math and ensures that the wave only animates
once, from start to finish.

Issue #11005936 regression on lockscreen animation for multi-wave widget

Change-Id: Id21a2e4d2271f01c82c4bc6e1f37d78e68b9b6e4
 2013-10-03 15:50:35 -07:00
Jim Miller
6689a7e8ef am 44c4dd93: am 8990e28b: Merge "Update default keyguard clock to new UX specification" into klp-dev 
* commit '44c4dd9316f00f22c68707bcf4dbf2326649628c':
  Update default keyguard clock to new UX specification
 2013-10-03 15:48:28 -07:00
Michael Wright
4138766ab6 am 448a1f6f: am cf5b34b0: Merge "Ensure WallpaperEngine has correct size information" into klp-dev 
* commit '448a1f6fed1d16578527500157da4ed3c72f2b90':
  Ensure WallpaperEngine has correct size information
 2013-10-03 15:42:08 -07:00
Craig Mautner
3ab914cfa5 am 63c375d3: am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev 
* commit '63c375d325c8b89111551c8d236fc46ff1304ff2':
  Retain IME assignment if no windows accept input.
 2013-10-03 15:42:01 -07:00
Adam Powell
310796de0b am d6239b92: Merge "Add a scrubber to keyguard; layout tweaks" into klp-dev 
* commit 'd6239b922901420b6855a7dad903632c85ccde68':
  Add a scrubber to keyguard; layout tweaks
 2013-10-03 15:41:59 -07:00
Vinit Deshapnde
90a5192cd4 am e72aa641: am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after reboot issue" into klp-dev 
* commit 'e72aa641d38911ed57c81ff4769ebe2c7ebb1397':
  Fix EAP-TLS reconnect after reboot issue
 2013-10-03 15:41:58 -07:00