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

116072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Svetoslav Ganov
2b40c83ae1 Deleting print job files when we do not have to. 
The print job file name was not properly parsed. This resulted
in incorrect mapping from file to print job, thus deleting the
file when we do not have to.

bug:11069354

Change-Id: I7b8a7a7f98dd77b34119f2a9cd16a6ec3c22b63b
 2013-10-04 08:49:32 -07: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
Chet Haase
1d3c4b396a Fix infinite recursion in hashcode of Spannables 
An app created a SpannableStringBuilder, one of which's spans was the
instance of the string builder itself (that is, the builder contained a span
that was the builder). This caused infinite recursion in the hashcode()
method because it computes a hash from its fields, including all of its spans.

The fix detects the case where a span equals the current instance and
noops the computation on that span. A similar adjustment was made to equals()
to avoid the same recursion problem.

Issue #11051658 StackOverflowError in android.text.SpannableStringBuilder.hashCode

Change-Id: I742687ab32d81ac51c4b9135f698cf5e96a1d295
 2013-10-04 07:24:19 -07: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
Dianne Hackborn
9357b11a79 Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)... 
...to crashing processes.

So don't.

Change-Id: I4b4fefb501b430fadaca93405206264318c8b95d
 2013-10-03 18:27:48 -07: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
Alex Ray
0c9d61f098 Add Consumer IR feature 
Bug: 10676690
Change-Id: Id2c118225dc6ef259f5ed97da4071e9b6de3a83a
 2013-10-03 18:19:38 -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
Alan Viverette
913949dbd6 Merge "Simplify matrix calculations for display adjustment" 2013-10-04 01:05:10 +00: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
Scott Main
49551ad60b add -since flag for api level 19 to filter javadocs 
Change-Id: I96e7e31f93b1e3c3877a342b84fb069bda5d92e3
 2013-10-03 16:46:53 -07:00
Alan Viverette
36f4b08341 Simplify matrix calculations for display adjustment 
Removes MatrixUtils, which is now unused.

Change-Id: Ifa809d2aeafa415d3861e59e4c7a8b115e76a2df
 2013-10-03 16:46:04 -07:00
Christopher Tate
f2d9391b33 am 64884eef: am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit '64884eef54bb110cead05d9b3f1a5928d5cf5349':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 16:43:20 -07:00
Adam Lesinski
38dc2ad85e am b2db2fbc: am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev 
* commit 'b2db2fbce33dbcfa52ccb20267ad4897c558c34f':
  Private flags are masked in correct variable
 2013-10-03 16:43:17 -07:00
Svetoslav
9bc6cdaed3 am a0867328: am 36f38f4e: am 9907a109: Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev 
* commit 'a0867328db32884d0791435da04ecdeb297d0246':
  Fix screen magnifier scaling due to ScaleGestureDetector changes.
 2013-10-03 16:43:13 -07:00
John Reck
eebcc0ff60 am cd6a2d30: am 47dc3248: am 9a93f6f0: Merge "Reduce max recents on lowram" into klp-dev 
* commit 'cd6a2d3079ee67658535773021c16787b9adba6e':
  Reduce max recents on lowram
 2013-10-03 16:43:09 -07: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