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

113314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
33069f40e5 am 47869404: am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 
* commit '47869404cb8233c536a0a5d2c5ce4d0089e39882':
  Surface: Change OutOfResourcesException to be a runtime exception
 2013-09-11 17:22:40 -07:00
Victoria Lease
2805ec5753 am 5d345dbe: am 444ae3a2: Merge "include Padauk in fallback chain" into klp-dev 
* commit '5d345dbe31a7136702e7e126a16ecfdae1ca5738':
  include Padauk in fallback chain
 2013-09-11 17:22:38 -07:00
Amith Yamasani
b5dec6a606 am dd9157ce: am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev 
* commit 'dd9157ce314f3b8d20f6b65a6f9dbf00acbe7ea1':
  Handle the case where the restore environment doesn't have the ringtone
 2013-09-11 17:22:35 -07:00
Dianne Hackborn
7c3c23114b am 33f92b6f: am c1cf491d: Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 
* commit '33f92b6fe249db2ae822c6702955c7b987ff87f9':
  More on issue #10130785: Restore silence and vibrate settings...
 2013-09-11 17:22:26 -07:00
Kenny Root
4945409031 am 4a0be803: am b5f694f6: Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 
* commit '4a0be803a9414bf95553999e2a0504311a346a8b':
  Revert "Reconcile differences between zip implementations"
 2013-09-11 17:22:23 -07:00
Jonathan Dixon
fcb17d0375 resolved conflicts for merge of 42513ca1 to master 
frameworks/base/tools was move to frameworks/tools in
I3ffafdab27cc4aca256c3a5806b630795b75d5c8)

Conflicts:
	tools/layoutlib/bridge/src/android/webkit/WebView.java

Change-Id: Idc834b0e1a4bd0d6b2c5cf6de137e45f07da4344
 2013-09-11 17:18:16 -07:00
Martijn Coenen
7b0b2643eb am ae8b57a5: am b7e5692b: Merge "Add support for loading banners from HCE services." into klp-dev 
* commit 'ae8b57a5f3e6651ea272f589eb6dd78f4ff2fc68':
  Add support for loading banners from HCE services.
 2013-09-11 16:49:14 -07:00
Dianne Hackborn
7f1a42199e Merge "resolved conflicts for merge of 03422d26 to master" 2013-09-11 23:48:18 +00:00
Dianne Hackborn
8d717b917c resolved conflicts for merge of 03422d26 to master 
Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82
 2013-09-11 16:43:22 -07:00
Matthew Williams
c0b9bba53a Merge "Fix deadlock occurring on account add in SyncManager." 2013-09-11 23:40:52 +00:00
Matthew Williams
7a2ab3a060 Fix deadlock occurring on account add in SyncManager. 
deadlock caused by autosync from changing sync settings.
Some minor refactoring of the function that caused the deadlock
Bug: 10666901
Change-Id: I7cf901b1954e59dbb0bc71a5de23117353b460b1
 2013-09-11 23:40:17 +00:00
Kenny Root
fa34d2ccba Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

(cherry picked from commit 0c4b3646b0feb1bed89bf374ff03af797834d8c3)

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 22:42:02 +00:00
Igor Murashkin
47869404cb am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 
* commit '2cad64c0fbeba07bb546674e19cfb0166d7ec332':
  Surface: Change OutOfResourcesException to be a runtime exception
 2013-09-11 11:30:14 -07:00
Victoria Lease
5d345dbe31 am 444ae3a2: Merge "include Padauk in fallback chain" into klp-dev 
* commit '444ae3a2e66b4404fa715ab46403da09079dd572':
  include Padauk in fallback chain
 2013-09-11 11:30:11 -07:00
Amith Yamasani
dd9157ce31 am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev 
* commit 'b926d484a76eda4152ba46d3ef517517226ca699':
  Handle the case where the restore environment doesn't have the ringtone
 2013-09-11 11:30:08 -07:00
Igor Murashkin
2cad64c0fb Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 2013-09-11 18:28:07 +00:00
Victoria Lease
444ae3a2e6 Merge "include Padauk in fallback chain" into klp-dev 2013-09-11 18:27:59 +00:00
Amith Yamasani
b926d484a7 Merge "Handle the case where the restore environment doesn't have the ringtone" into klp-dev 2013-09-11 18:27:53 +00:00
Dianne Hackborn
33f92b6fe2 am c1cf491d: Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 
* commit 'c1cf491d160f8feb74b24d4ebb4e39324850cf61':
  More on issue #10130785: Restore silence and vibrate settings...
 2013-09-11 11:16:44 -07:00
Kenny Root
4a0be803a9 am b5f694f6: Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 
* commit 'b5f694f683cb85b308f3733a3507a98fbff0532c':
  Revert "Reconcile differences between zip implementations"
 2013-09-11 11:16:40 -07:00
Dianne Hackborn
c1cf491d16 Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 2013-09-11 18:13:17 +00:00
Kenny Root
b5f694f683 Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 2013-09-11 18:11:34 +00:00
Amith Yamasani
2e804444d6 Handle the case where the restore environment doesn't have the ringtone 
Bug: 10130785

uncanonicalize() can return a null now, so abort restoring the ringtone
in that case.

Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe
 2013-09-11 11:11:19 -07:00
Kenny Root
0c4b3646b0 Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 18:10:09 +00:00
Jonathan Dixon
42513ca1a6 am caee47f0: Merge "Preparation for deleting WebViewClassic" into klp-dev 
* commit 'caee47f096403068f02c41a91f8dad1aa5d13169':
  Preparation for deleting WebViewClassic
 2013-09-11 11:05:42 -07:00
Dianne Hackborn
b3ac67a0ec More on issue #10130785: Restore silence and vibrate settings... 
...in settings > sound

ContentResolver.uncanonicalize needs to be able to fail.

Change-Id: I347ef60fc3619aae203b87079579597c60be8b90
 2013-09-11 11:04:21 -07:00
Jonathan Dixon
caee47f096 Merge "Preparation for deleting WebViewClassic" into klp-dev 2013-09-11 17:59:42 +00:00
Martijn Coenen
ae8b57a5f3 am b7e5692b: Merge "Add support for loading banners from HCE services." into klp-dev 
* commit 'b7e5692b62cf0f3f1b02d8dc1008f3faf12df584':
  Add support for loading banners from HCE services.
 2013-09-11 10:54:51 -07:00
Adam Skory
f8f6ef0204 am abc7f543: am 427e92a2: Merge "Fix bad references in preloaded-classes" into klp-dev 
* commit 'abc7f5438c2b63864ba964f155d1efe7ea006803':
  Fix bad references in preloaded-classes
 2013-09-11 10:52:26 -07:00
Martijn Coenen
b7e5692b62 Merge "Add support for loading banners from HCE services." into klp-dev 2013-09-11 17:52:18 +00:00
Dianne Hackborn
03422d2626 am e9aad4ae: Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev 
* commit 'e9aad4ae31caeb00f95d83119c2020f4cb5f345c':
  Fix issue #10688644: Java crash in com.android.phone:
 2013-09-11 10:49:10 -07:00
Adam Skory
abc7f5438c am 427e92a2: Merge "Fix bad references in preloaded-classes" into klp-dev 
* commit '427e92a2652c3962df42fc63bc009986c4e15839':
  Fix bad references in preloaded-classes
 2013-09-11 10:49:06 -07:00
Dianne Hackborn
e9aad4ae31 Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev 2013-09-11 17:46:13 +00:00
Chris Craik
27569f2447 am a180fd6d: am 68fbe16b: Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev 
* commit 'a180fd6d67819a45bafc052581d43c0ecc1faccf':
  Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref
 2013-09-11 10:45:28 -07:00
Kenny Root
ef60bdaa96 am feaa3be3: am 139ae547: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'feaa3be34fae96f00d672b4be8b5cdc90126de76':
  Reconcile differences between zip implementations
 2013-09-11 10:45:24 -07:00
Adam Skory
427e92a265 Merge "Fix bad references in preloaded-classes" into klp-dev 2013-09-11 17:44:15 +00:00
Chris Craik
a180fd6d67 am 68fbe16b: Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev 
* commit '68fbe16ba0072326c1c6b09817f46ccdc5ee15b9':
  Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref
 2013-09-11 10:42:09 -07:00
Kenny Root
feaa3be34f am 139ae547: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit '139ae5477f2df8aef40f0689371b055a438a72af':
  Reconcile differences between zip implementations
 2013-09-11 10:42:04 -07:00
Yuhao Zheng
c726dcb803 am 05e7e345: am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev 
* commit '05e7e3450006438311b18d6b0be920ad5579782a':
  Fix for the toggle airplane mode hidden API
 2013-09-11 10:41:55 -07:00
Chris Craik
68fbe16ba0 Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev 2013-09-11 17:40:39 +00:00
Yuhao Zheng
05e7e34500 am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev 
* commit '518c0afaea02f9a680f6912bde2d73b0357236ca':
  Fix for the toggle airplane mode hidden API
 2013-09-11 10:38:36 -07:00
Kenny Root
139ae5477f Merge "Reconcile differences between zip implementations" into klp-dev 2013-09-11 17:38:26 +00:00
Adam Skory
aae67e11bc Fix bad references in preloaded-classes 
http://ag/352924 renamed INdefPushCallback
to IAppCallback. Update preloaded-classes
to reflect this.

This is a cherry-pick of Id552e94e3a01cdd61593480f3c0aedb32d185f80

Change-Id: I0901f14fb41f94e3c7572c09e090ec5903a878d1
 2013-09-11 18:35:33 +01:00
Yuhao Zheng
518c0afaea Merge "Fix for the toggle airplane mode hidden API" into klp-dev 2013-09-11 17:35:09 +00:00
Adam Skory
965c47902a Merge "Update api/current.txt" 2013-09-11 17:33:19 +00:00
Adam Skory
4591f1f2d8 Merge "Fix bad references in preloaded-classes" 2013-09-11 17:33:05 +00:00
quddusc
6eee22a73f am 91df3f3f: am ecf612a1: am eacfc308: am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit '91df3f3f0fb9c76864c3dfd94f7762d0bf7c6275':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:22:45 -07:00
quddusc
91df3f3f0f am ecf612a1: am eacfc308: am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'ecf612a15c6201d7a4c55f0fcceb077f3e9ad84e':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:19:49 -07:00
quddusc
ecf612a15c am eacfc308: am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'eacfc308344b34d27b7cd2ab8cc0fbdefbcc8167':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:17:41 -07:00
quddusc
eacfc30834 am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'a0b259a917f9c7cf73b4e8ceab104cdab4383c24':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:15:12 -07:00