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

124615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Primiano Tucci
f4e2723244 DO NOT MERGE: Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 244267500254daff8745f8c0fae3edcac735873f)

Cherry pick to klp-dev as part of Bug: 13246014

Conflicts:
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
 2014-03-03 18:01:53 +00:00
rich cannings
2c965bc5ef am 0e063f1e: am 3cff3474: am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '0e063f1e8aa71e03e5eea1cd56f555d78b7f2279':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:39:48 +00:00
John Spurlock
9abfa111a3 am 388eece1: am d708b2f1: am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '388eece1eae65d460d1cd29afe1ac9df79bf2885':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:39:44 +00:00
rich cannings
0e063f1e8a am 3cff3474: am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '3cff34742aa4f4b305b2edc462a369355b2e75da':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:35:14 +00:00
rich cannings
3cff34742a am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '341e6b73e6362f8757717a2518b370724c3a3913':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:31:35 +00:00
rich cannings
341e6b73e6 am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit 'fd6d8a8b736568ccb61af10dec04a99a8c36f29a':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:28:21 +00:00
rich cannings
fd6d8a8b73 am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit 'bc4d34dd8e5cfdccede6aefb163fe2283785c5b0':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:24:59 +00:00
rich cannings
bc4d34dd8e am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '8ebfbffcbb86123a54dd7979b26525eec30d77b9':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:21:58 +00:00
rich cannings
8ebfbffcbb Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 2014-03-03 17:19:02 +00:00
Patrick Tjin
36c96866f3 Merge "Fix typo in documentation" 2014-03-03 17:16:01 +00:00
John Spurlock
388eece1ea am d708b2f1: am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit 'd708b2f12bb8e85e34ac28d3d905e9701a554cfd':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:10:31 +00:00
John Spurlock
d708b2f12b am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit 'e3a6a7b4693e6efd29f973c8cfe91f5778f847f4':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:07:22 +00:00
John Spurlock
e3a6a7b469 am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '841aa8db20d09d80cd71ef2ed8eaebd4ebccfcc5':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:04:01 +00:00
John Spurlock
841aa8db20 am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '5237a792aabaa49063b15cefa26f0341ea9cd311':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:00:49 +00:00
John Spurlock
5237a792aa am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 16:57:22 +00:00
Adrian Roos
6d22d75cba Keyguard Analytics: Remove unused constant. 
Change-Id: I6fce6640e391d5f78468212aac7d14a8a6170115
 2014-03-03 17:53:44 +01:00
Victoria Lease
2b96157f92 Add casual/cursive/sans-serif-smallcaps font families. 
Bug: 12384866
Change-Id: I7482d228279a63ea92cb605de314b2f7d0ad483f
 2014-03-03 08:50:46 -08:00
Adrian Roos
58b58fe68b Add session analytics to Keyguard. 
On eng and userdebug builds, adds the possibility to track touch and sensor events on the Keyguard.

Change-Id: I9ff9fe5545cb9b7e6833a6af0b5a97a6c204dbd2
 2014-03-03 17:09:27 +01:00
Chris Wren
1cdd7dda61 enable heads up notifications 
Bug: 13208692
Change-Id: I3682ecb30c6997c578b76a578b79a8d13a6e6323
 2014-03-03 10:15:53 -05:00
Chris Wren
10d82dfbfb rename heads up global setting: base part 
Bug: 13208692
Change-Id: Ia020e4d63552ab4b8cbb8a37622c36776800a790
 2014-03-03 10:15:53 -05:00
John Spurlock
8c44c394bf Doc fixups to ContentResolver, MediaRouter. 
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
 2014-03-03 10:14:41 -05:00
Yohei Yukawa
c18cd393f6 Make sure InputMethodInfo implements Parcelable transitively 
This CL adds one more test to make sure InputMethodInfo
implements Parcelable correctly. This test makes sure that
one can marshall and unmarshall again from an unmarshalled
copy of InputMethodInfo.

BUG: 12954290
Change-Id: I5aa1552a8089fe0bac54513ba224e5bfc494be97
 2014-03-03 14:14:10 +09:00
Yorke Lee
535c9e74d3 Catch ActivityNotFoundException in quick contacts badge 
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)
 2014-03-01 18:07:22 +00:00
Ying Wang
03c6628f40 am 04c5bcf2: am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '04c5bcf2bb82099fa8c02dd9a38ccac36d326373':
  Fix indirect misuse of $(my-dir).
 2014-03-01 17:35:54 +00:00
Ying Wang
04c5bcf2bb am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '160c39d8a53793cb17dd8a9312d56eafced3cc0d':
  Fix indirect misuse of $(my-dir).
 2014-03-01 17:32:49 +00:00
Ying Wang
160c39d8a5 am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '26026c62788f508f9de0df608dd7043e7d1399f6':
  Fix indirect misuse of $(my-dir).
 2014-03-01 17:30:34 +00:00
Ying Wang
26026c6278 am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit 'dd72b6e76c5d5e819809bd3d2ef4ff6f700af759':
  Fix indirect misuse of $(my-dir).
 2014-03-01 09:27:42 -08:00
Ying Wang
dd72b6e76c Merge "Fix indirect misuse of $(my-dir)." 2014-03-01 17:25:10 +00:00
Ying Wang
f794d63425 Fix indirect misuse of $(my-dir). 
Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
 2014-02-28 18:04:37 -08:00
Tom O'Neill
84f494c278 Merge "Seeing if a provider is enabled doesn't require special permissions" 2014-03-01 01:40:19 +00:00
Tom O'Neill
afecea1805 Seeing if a provider is enabled doesn't require special permissions 
- Bug: 10696351

Change-Id: I4f1612ce10587728e71277587144fdcb59445b3f
 2014-02-28 17:38:31 -08:00
Tim Murray
78214c9531 Fix null check for BaseObj.equals. 
Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
 2014-02-28 16:57:47 -08:00
Dianne Hackborn
77b987f1a1 Hold a wake lock while dispatching network activity events. 
Also add new API for determining whether the current data network
is active, and thus better scheduling network operations.  This
API is designed to not be tied to a mobile network -- regardless
of the network, apps can use it to determine whether they should
initiate activity or wait.  On non-mobile networks, it simply always
reports as the network being active.

This changed involved reworking how the idle timers are done so
that we only register an idle timer with the current default
network.  This way, we can know whether we currently expect to
get callbacks about the network being active, or should just always
report that it is active.  (Ultimately we need to be getting this
radio active data from the radio itself.)

Change-Id: Iaf6cc91a960d7542a70b72f87a7db26d12c4ea8e
 2014-02-28 15:19:39 -08:00
John Spurlock
454a038470 Merge "Wire up SystemUI zen mode config to new settings panel." 2014-02-28 23:05:49 +00:00
Chris Wren
92aaff8a80 Merge "add a setting for the heads up: base part" 2014-02-28 23:00:19 +00:00
John Spurlock
de547008d1 Wire up SystemUI zen mode config to new settings panel. 
Change-Id: I949b31be0b31c02ab736799f9080601fb0fd79d1
 2014-02-28 17:50:39 -05:00
Chris Wren
7bd2412332 add a setting for the heads up: base part 
also fix a crash if the feature is disabled and then enabled
while a heads up is active.

Bug: 13208692
Change-Id: I6847f7a5f275aee2f608de0237dab0e45c39b33f
 2014-02-28 17:37:51 -05:00
Will Haldean Brown
718e39f1dc am 987fb9cd: am 9d50308b: am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 
* commit '987fb9cd299bf0bf73bec233eaf184fb4e8353ac':
  Maintain binding to crashed listeners from NotificationManagerService.
 2014-02-28 22:36:25 +00:00
Will Haldean Brown
987fb9cd29 am 9d50308b: am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 
* commit '9d50308b3e51b871e541397384d8c59d7717bd56':
  Maintain binding to crashed listeners from NotificationManagerService.
 2014-02-28 22:33:50 +00:00
Takeshi Kishimoto
c6f0de6cb4 Merge "Changed MTU for mcc440-mnc20 (SoftBank Mobile) per their request." 2014-02-28 22:32:04 +00:00
Will Haldean Brown
9d50308b3e am 41044e5e: Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 
* commit '41044e5e8ef3ade33ae5d6377beca5852851a16b':
  Maintain binding to crashed listeners from NotificationManagerService.
 2014-02-28 22:30:31 +00:00
Will Haldean Brown
41044e5e8e Merge "Maintain binding to crashed listeners from NotificationManagerService." into klp-modular-dev 2014-02-28 22:26:17 +00:00
John Reck
fa22e9e001 Merge "Avoid running functors after detach" 2014-02-28 21:20:27 +00:00
Nick Kralevich
1c05125ae2 am 33fc60d6: am 7842cff8: am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '33fc60d64e82adeea7a9478be3a153a7c7ab9537':
  Fix descriptor leak after accepting connections
 2014-02-28 21:16:08 +00:00
Nick Kralevich
33fc60d64e am 7842cff8: am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '7842cff88dd519d5eba6ff86e21f9ce616d9ad9b':
  Fix descriptor leak after accepting connections
 2014-02-28 21:13:04 +00:00
Nick Kralevich
7842cff88d am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '787d81453ce1e5451bd2c289c8b53cfeda2eab29':
  Fix descriptor leak after accepting connections
 2014-02-28 21:07:55 +00:00
Nick Kralevich
787d81453c am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '4a79484648262d5d0dc9e72c3d9cf36c77cca599':
  Fix descriptor leak after accepting connections
 2014-02-28 13:04:42 -08:00
Nick Kralevich
4a79484648 Merge "Fix descriptor leak after accepting connections" 2014-02-28 21:02:21 +00:00
John Reck
f9a901e101 Avoid running functors after detach 
Bug: 10861732

Change-Id: Ida55fff716c37c6ab1c98eef02582282de0034f6
 2014-02-28 13:02:15 -08:00
Chris Craik
adbd2ba1bc Call correct MaskFilter factory method 
Change-Id: Ibc30361427cc484443579930f729145ef19c6916
 2014-02-28 12:47:47 -08:00