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

119920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Shrauner
1fdcab956d am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '81f74c7d427f2942cdccae30329694e9825f5d8f':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:16:50 +00:00
Dirk Dougherty
26de0b7118 am cce121fb: Merge "Update permission description string." into klp-docs 
* commit 'cce121fb7504fbc460b85564735ff5d8a1ed4d55':
  Update permission description string.
 2014-03-03 22:13:31 +00:00
Dirk Dougherty
cce121fb75 Merge "Update permission description string." into klp-docs 2014-03-03 22:10:26 +00:00
Dirk Dougherty
08d7c2861f Update permission description string. 
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
 2014-03-03 14:05:21 -08:00
Jay Shrauner
81f74c7d42 am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '7e3efa82ecbb9e3cf50f8f455e573aed3b88d183':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:05:02 +00:00
Jay Shrauner
7e3efa82ec am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '1f168fd43895e2a84c037df9f3ea54e36f5d0d16':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:02:14 +00:00
Scott Main
22a9fb31a4 dashboard update for march '14 
Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c
 2014-03-03 14:00:59 -08:00
Jay Shrauner
1f168fd438 am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93 Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 2014-03-03 21:56:18 +00:00
Jonathan Dixon
8553be9b67 am 6ab920fb: am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '6ab920fb614cb7d33498ec75254df5a7fd271ed3':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 21:22:22 +00:00
Bart Sears
5acee80689 am 5a0a37e2: am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '5a0a37e23d73befbd7ebf0e8a252a40b0102b72f':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 21:22:19 +00:00
Jonathan Dixon
6ab920fb61 am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '5b741144a6feadb5c51fecb0235c605f0b9fb803':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 21:16:47 +00:00
Bart Sears
5a0a37e23d am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '73eefce3085a0fbe3ab65e69af319b21b92c7252':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 21:16:43 +00:00
Tim Murray
4db08b044d am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit '9f141fbb786c07ff56324717e1e0747a3cabf23b':
  Fix null check for BaseObj.equals.
 2014-03-03 20:41:01 +00:00
Jonathan Dixon
5b741144a6 am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '3c88a685021a5acd099dc7625a11e8d98f0e8fbe':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 20:33:20 +00:00
Bart Sears
73eefce308 am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '7f9503267c7ad49f6364bd132bc6259e346b7b51':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 20:33:16 +00:00
Jonathan Dixon
3c88a68502 am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '7c01f9f7abd9eb1aefdf712be98d57e4075422bb':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 20:29:46 +00:00
Bart Sears
7f9503267c am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit 'e31c05296d8cde8f6d99f18ef039fd6823ec54a9':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 20:29:43 +00:00
Tim Murray
9f141fbb78 am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit 'fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc':
  Fix null check for BaseObj.equals.
 2014-03-03 20:21:27 +00:00
Tim Murray
fb51a4301c am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9':
  Fix null check for BaseObj.equals.
 2014-03-03 11:12:01 -08:00
Tim Murray
8377a4fd03 Merge "Fix null check for BaseObj.equals." 2014-03-03 19:09:08 +00:00
Jonathan Dixon
7c01f9f7ab am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit 'efe1b2402abd6f26f6483533b68983475f6e6144':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 18:54:35 +00:00
Bart Sears
e31c05296d am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 18:50:25 +00:00
Jonathan Dixon
efe1b2402a DO NOT MERGE: Fix build after checkThread fix merge to master 
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.

Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba709273b3d46a1ef3b091eb2292c917)

Cherry pick to klp-dev as part of Bug: 13246014
 2014-03-03 18:48:00 +00:00
Bart Sears
4e1bf73202 Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 2014-03-03 18:42:28 +00:00
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
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
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
Victoria Lease
2b96157f92 Add casual/cursive/sans-serif-smallcaps font families. 
Bug: 12384866
Change-Id: I7482d228279a63ea92cb605de314b2f7d0ad483f
 2014-03-03 08:50:46 -08:00
John Spurlock
8c44c394bf Doc fixups to ContentResolver, MediaRouter. 
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
 2014-03-03 10:14:41 -05: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
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
Tim Murray
78214c9531 Fix null check for BaseObj.equals. 
Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
 2014-02-28 16:57:47 -08: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
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
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