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

114871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
c170c22cc0 Import translations. DO NOT MERGE 
Change-Id: I1227decae162536bf90ffb753308cb4018e0538e
Auto-generated-cl: translation import
 2013-10-04 11:08:41 -07:00
Robert Greenwalt
f3f1a37093 Merge "Un-deprecate getDhcpInfo" into klp-dev 2013-10-04 18:07:34 +00:00
Robert Greenwalt
0fb5a4d8ca Merge "Don't redirect dns to an iface without dns servers" into klp-dev 2013-10-04 18:06:13 +00:00
Baligh Uddin
fd2c7d10a5 Import translations. DO NOT MERGE 
Change-Id: I161f98685fc14784a937b2df20da1b2480dc9434
Auto-generated-cl: translation import
 2013-10-04 11:06:12 -07:00
Baligh Uddin
fb60905c65 Import translations. DO NOT MERGE 
Change-Id: I0774c814f839f7a06aaa3cb023782e8eb0adf305
Auto-generated-cl: translation import
 2013-10-04 11:05:28 -07:00
Baligh Uddin
e21e8cfca2 Import translations. DO NOT MERGE 
Change-Id: Ib4c73d8383110d55f2bec06058b7f8d9a01d05ce
Auto-generated-cl: translation import
 2013-10-04 11:03:39 -07:00
Baligh Uddin
3eb6b8d626 Import translations. DO NOT MERGE 
Change-Id: Id91951dbb1084dd04fd93aa1cd26b6b558ff33ef
Auto-generated-cl: translation import
 2013-10-04 11:02:34 -07:00
Dianne Hackborn
4ad5e888d4 am 0f92dde3: am ae7b22d6: Merge "Fix issue #10901205: Shouldn\'t send broadcasts (or try to bind services, etc.)..." into klp-dev 
* commit '0f92dde36f1f68c246e49943445676ce21a339c8':
  Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)...
 2013-10-04 10:55:58 -07:00
Dianne Hackborn
0f92dde36f am ae7b22d6: Merge "Fix issue #10901205: Shouldn\'t send broadcasts (or try to bind services, etc.)..." into klp-dev 
* commit 'ae7b22d61df0aef471c50d56a06a7d4316daffc6':
  Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)...
 2013-10-04 10:52:41 -07:00
Dianne Hackborn
ae7b22d61d Merge "Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)..." into klp-dev 2013-10-04 17:47:34 +00:00
Robert Greenwalt
cb2fe96f2c Un-deprecate getDhcpInfo 
Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
 2013-10-04 09:53:39 -07:00
Svetoslav Ganov
57f1c60f41 am 2658f35a: am 6bf10299: Merge "Deleting print job files when we do not have to." into klp-dev 
* commit '2658f35a5e58c65b9d5ff063f16a22dae4472669':
  Deleting print job files when we do not have to.
 2013-10-04 09:53:16 -07:00
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
Svetoslav Ganov
2658f35a5e am 6bf10299: Merge "Deleting print job files when we do not have to." into klp-dev 
* commit '6bf1029900d09d0432fb82f8c076bdb3eefc1f6c':
  Deleting print job files when we do not have to.
 2013-10-04 09:51:40 -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
Svetoslav Ganov
6bf1029900 Merge "Deleting print job files when we do not have to." into klp-dev 2013-10-04 16:50:53 +00: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
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
Robert Greenwalt
f76b5383cd DO NOT MERGE Un-deprecate getDhcpInfo 
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
 2013-10-04 08:19:37 -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