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

113164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Williams
bec23ea922 Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev 2013-09-09 22:06:05 +00:00
Craig Mautner
72a533adac am e2b8bd72: am 16c32207: Merge "Do not enter resumeTopActivity recursively." into klp-dev 
* commit 'e2b8bd72bd325de9c258fa9c8ef4143420796614':
  Do not enter resumeTopActivity recursively.
 2013-09-09 15:02:44 -07:00
Craig Mautner
e2b8bd72bd am 16c32207: Merge "Do not enter resumeTopActivity recursively." into klp-dev 
* commit '16c3220734f3cbf32c0148d82815d93e2f28af65':
  Do not enter resumeTopActivity recursively.
 2013-09-09 14:57:49 -07:00
Craig Mautner
16c3220734 Merge "Do not enter resumeTopActivity recursively." into klp-dev 2013-09-09 21:55:20 +00:00
Amith Yamasani
b25158886b Don't leave space for summary text if it's an empty string 
Bug: 10639567
Change-Id: Ifeb71ea0779a86e39fe55fb0bc6cd267dba4a92e
 2013-09-09 14:50:21 -07:00
Matthew Williams
d8abd6a163 Preserve CTS fail behaviour on null bundle for old API 
For ContentResolver.requestSync() a null bundle should not be
allowed. However we don't want to enforce this for the new API,
so we remove this check from the SyncRequest.Builder#build()

Change-Id: I69353d24edbd686da6ded2856c0920315cb76e85
 2013-09-09 14:35:27 -07:00
Christopher Tate
b7b64ffca7 am 5afe5288: am 4d0b9aba: Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev 
* commit '5afe5288a60a5264efb1e6979a065351482b1a18':
  Fix clearApplicationUserData() to allow a null observer
 2013-09-09 14:33:43 -07:00
Christopher Tate
5afe5288a6 am 4d0b9aba: Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev 
* commit '4d0b9abae70bdf9a083c3ff7c92088e47637c57a':
  Fix clearApplicationUserData() to allow a null observer
 2013-09-09 14:29:45 -07:00
Chet Haase
208ebece29 am 3327dfd4: am d94b1e11: Merge "Show view overlays in hierarchyviewer" into klp-dev 
* commit '3327dfd43ca82f28a2517de8f275cd64ca335d0b':
  Show view overlays in hierarchyviewer
 2013-09-09 14:29:14 -07:00
Christopher Tate
4d0b9abae7 Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev 2013-09-09 21:26:50 +00:00
Chet Haase
3327dfd43c am d94b1e11: Merge "Show view overlays in hierarchyviewer" into klp-dev 
* commit 'd94b1e11b94b599a70e4a8cf738a9f62b7d67e36':
  Show view overlays in hierarchyviewer
 2013-09-09 14:25:17 -07:00
Christopher Tate
31b65f9aa1 Fix clearApplicationUserData() to allow a null observer 
The services themselves already handle 'null' to mean "no observer";
it was just the non-AIDL marshalling code that wasn't doing the
right thing.

Bug 9588299

Change-Id: I99e26cd207f91e8060d9fc113aef90a106640b64
 2013-09-09 14:17:27 -07:00
Svetoslav Ganov
e668c0a175 am 994e5a5a: am 3bbd3aea: Merge "AccessibilityNodeInfo incorrectly cloned." into klp-dev 
* commit '994e5a5afcf88923815e2b241dc8f15fe82823c8':
  AccessibilityNodeInfo incorrectly cloned.
 2013-09-09 14:14:57 -07:00
Leon Scroggins III
fe3b9727ba am a818f0fa: am 91c8111d: Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev 
* commit 'a818f0face6eeee24795c80f8c3b66169e75ffba':
  Register jni objs in CreateJavaOutputStreamAdaptor
 2013-09-09 14:14:49 -07:00
Chris Craik
ebc6c4bb17 am 177718a7: am f25fceef: Merge "Update doc for BitmapFactory.Options to include BitmapRegionDecoder" into klp-dev 
* commit '177718a7d2fa22ee8b982b1c19d4db50beb5790b':
  Update doc for BitmapFactory.Options to include BitmapRegionDecoder
 2013-09-09 14:14:46 -07:00
Mindy Pereira
140fd18968 am 3412c80e: am 99cea983: Merge "Update default ramp up time for autoscroller." into klp-dev 
* commit '3412c80e76ce4a5a5d5615bb66d6b871854400c0':
  Update default ramp up time for autoscroller.
 2013-09-09 14:14:43 -07:00
Svetoslav Ganov
b47a65eeec am 5e811115: am cf305e18: Merge "Add dumping the state of the print sub-system." into klp-dev 
* commit '5e811115a9e106a9a167354ba6700146015ecb97':
  Add dumping the state of the print sub-system.
 2013-09-09 14:14:39 -07:00
Dianne Hackborn
9542acab2f am d8c06fab: am 80213add: Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev 
* commit 'd8c06fab80d4fa6c2eeef697bdfdbaff88b3d934':
  Fix issue #10671878: Proc stats needs to remove old data structures
 2013-09-09 14:14:36 -07:00
Alan Viverette
4e17981cdc am b198dbaf: am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev 
* commit 'b198dbaf19fcad86f81226aa06644db41d6028e4':
  Add WebVTT caption renderer
 2013-09-09 14:14:33 -07:00
Eric Rowe
279afa504e am f2a24a06: am 93d71945: Merge "Add PID and application to Java crash printout" into klp-dev 
* commit 'f2a24a0672db102008a24b2fbc207a2e489c9797':
  Add PID and application to Java crash printout
 2013-09-09 14:14:28 -07:00
Chet Haase
d94b1e11b9 Merge "Show view overlays in hierarchyviewer" into klp-dev 2013-09-09 21:10:56 +00:00
Svetoslav Ganov
994e5a5afc am 3bbd3aea: Merge "AccessibilityNodeInfo incorrectly cloned." into klp-dev 
* commit '3bbd3aea604e6132c95a2f1f6e10c993ecc70d8b':
  AccessibilityNodeInfo incorrectly cloned.
 2013-09-09 14:08:33 -07:00
Leon Scroggins III
a818f0face am 91c8111d: Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev 
* commit '91c8111d3ae654e7646e9cbcf486554a8810b47c':
  Register jni objs in CreateJavaOutputStreamAdaptor
 2013-09-09 14:08:30 -07:00
Chris Craik
177718a7d2 am f25fceef: Merge "Update doc for BitmapFactory.Options to include BitmapRegionDecoder" into klp-dev 
* commit 'f25fceefdfc35079799c7cb6e01b28dce8a5bfce':
  Update doc for BitmapFactory.Options to include BitmapRegionDecoder
 2013-09-09 14:08:27 -07:00
Mindy Pereira
3412c80e76 am 99cea983: Merge "Update default ramp up time for autoscroller." into klp-dev 
* commit '99cea983de196aae34a39cd4eb03ae1f93cc771a':
  Update default ramp up time for autoscroller.
 2013-09-09 14:08:24 -07:00
Svetoslav Ganov
5e811115a9 am cf305e18: Merge "Add dumping the state of the print sub-system." into klp-dev 
* commit 'cf305e18c316cc53e4870548df3cc886d4ef5418':
  Add dumping the state of the print sub-system.
 2013-09-09 14:08:22 -07:00
Dianne Hackborn
d8c06fab80 am 80213add: Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev 
* commit '80213adddaec79981aff47c81bdaac38725f2644':
  Fix issue #10671878: Proc stats needs to remove old data structures
 2013-09-09 14:08:19 -07:00
Alan Viverette
b198dbaf19 am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev 
* commit '013634cc44d62fe90cd3e80a7530cffdc79f9715':
  Add WebVTT caption renderer
 2013-09-09 14:08:14 -07:00
Eric Rowe
f2a24a0672 am 93d71945: Merge "Add PID and application to Java crash printout" into klp-dev 
* commit '93d71945d88f38b784de3c12d7ae781e97735582':
  Add PID and application to Java crash printout
 2013-09-09 14:08:12 -07:00
Chris Craik
cd0ba71aa9 Create a pixelref wrapper for reused bitmaps 
Reused bitmaps may gain a color table when reused, so we wrap a new
AndroidPixelRef that holds the color table around the old.

bug:10608305
Change-Id: I35288edf3158cfda21c500360ad1abdf5654af8d
 2013-09-09 14:08:11 -07:00
Svetoslav Ganov
3bbd3aea60 Merge "AccessibilityNodeInfo incorrectly cloned." into klp-dev 2013-09-09 21:06:38 +00:00
Leon Scroggins III
91c8111d3a Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev 2013-09-09 20:57:12 +00:00
Chris Craik
f25fceefdf Merge "Update doc for BitmapFactory.Options to include BitmapRegionDecoder" into klp-dev 2013-09-09 20:53:18 +00:00
Mindy Pereira
99cea983de Merge "Update default ramp up time for autoscroller." into klp-dev 2013-09-09 20:51:16 +00:00
Svetoslav Ganov
6685f1bace AccessibilityNodeInfo incorrectly cloned. 
The code that creates a clone of an AccessibilityNodeInfo was not cloning
the extension objects (CollectionInfo, CollectionItemInfo, and RangeInfo)
and as a result if the original accessibility node info is recycled the
extension objects of the clone are also recycled and now if one tries to
recycle the clone gets an exception that the extension objects are already
recycled. Fun!

bug:10642952

Change-Id: I84192466bff0e865de04b79079e6ceecdffb37a6
 2013-09-09 13:43:21 -07:00
Svetoslav Ganov
cf305e18c3 Merge "Add dumping the state of the print sub-system." into klp-dev 2013-09-09 20:41:28 +00:00
Dianne Hackborn
80213addda Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev 2013-09-09 20:37:02 +00:00
Alan Viverette
013634cc44 Merge "Add WebVTT caption renderer" into klp-dev 2013-09-09 20:31:14 +00:00
Svetoslav Ganov
b669917825 Add dumping the state of the print sub-system. 
Being able to dump the state of the print sub-system especially when
taking a bugreport is very useful for bug fixing and observing whether
the print system operates properly.

bug:10659019

Change-Id: Id098b788f474ab17766966a4563ffdfc0171c76b
 2013-09-09 13:15:15 -07:00
Craig Mautner
e5273b422e Do not enter resumeTopActivity recursively. 
Changes for translucent activity were causing activities to be
launched twice due to a recursive call into resumeTopActivity.
Putting the translucent action onto a handler removes the recursivity
and fixes the multiple launch problem.

Fixes bug 10556969.

Change-Id: I2bb53cd555b0aaf093ab35db2859acb10b58211e
 2013-09-09 12:57:47 -07:00
Eric Rowe
93d71945d8 Merge "Add PID and application to Java crash printout" into klp-dev 2013-09-09 19:57:20 +00:00
Tom O'Neill
6446e4595c am a849dd62: am fb75487f: Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev 
* commit 'a849dd621432c7c3d369e5cedb722d6aa00eaa06':
  Explain what warnIfCallingFromSystemProcess() is about
 2013-09-09 12:47:56 -07:00
Deepanshu Gupta
584b7f95a7 am d7cdc168: (-s ours) am a7127540: Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev 
* commit 'd7cdc1682750bdae6ac38231c810fd56c7bf2ca2':
  Add isPremultiplied option to Bitmap_Delegate in LayoutLib
 2013-09-09 12:44:25 -07:00
Tom O'Neill
a849dd6214 am fb75487f: Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev 
* commit 'fb75487f8af748feb83ce3116c4d6dcc4e819027':
  Explain what warnIfCallingFromSystemProcess() is about
 2013-09-09 12:44:00 -07:00
Tom O'Neill
fb75487f8a Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev 2013-09-09 19:41:25 +00:00
Deepanshu Gupta
d7cdc16827 am a7127540: Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev 
* commit 'a71275401143bc259fd5804ab6852fc3265d88b7':
  Add isPremultiplied option to Bitmap_Delegate in LayoutLib
 2013-09-09 12:40:27 -07:00
Deepanshu Gupta
a712754011 Merge "Add isPremultiplied option to Bitmap_Delegate in LayoutLib" into klp-dev 2013-09-09 19:35:03 +00:00
Eric Rowe
35980b2cf5 Add PID and application to Java crash printout 
Bug: 10568405
Change-Id: I508e89bf7ea58e15a8460099036e270139b2e2a9
 2013-09-09 11:40:31 -07:00
Eric Rowe
001ebe0ec6 am a130a316: am e13aa0ba: Merge "Add PID to ANR logcat printout." into klp-dev 
* commit 'a130a3161432bd4e2f267d3de43c75c9a87c667a':
  Add PID to ANR logcat printout.
 2013-09-09 11:36:30 -07:00
Eric Rowe
a130a31614 am e13aa0ba: Merge "Add PID to ANR logcat printout." into klp-dev 
* commit 'e13aa0ba99de3dfa2bc3aee1defe9972d23fcd12':
  Add PID to ANR logcat printout.
 2013-09-09 11:31:33 -07:00