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

84968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
a219af1ca6 Import translations. DO NOT MERGE 
Change-Id: I3c4f6d1a308dab00871df4b8ba3f633dbe48ac78
Auto-generated-cl: translation import
 2012-08-31 08:44:34 -07:00
Jeff Brown
51f4f43a57 am 68a6f2a7: am 00453e7a: Merge "Tweak overlay display adapter scaling." into jb-mr1-dev 
* commit '68a6f2a737ce6dc0f418132edbef9cd84e201d1c':
  Tweak overlay display adapter scaling.
 2012-08-31 00:46:00 -07:00
Jeff Brown
68a6f2a737 am 00453e7a: Merge "Tweak overlay display adapter scaling." into jb-mr1-dev 
* commit '00453e7a0182b50cf01e65c97650b526284fe084':
  Tweak overlay display adapter scaling.
 2012-08-31 00:43:56 -07:00
Jeff Brown
00453e7a01 Merge "Tweak overlay display adapter scaling." into jb-mr1-dev 2012-08-31 00:41:15 -07:00
Baligh Uddin
c689b65bc1 am 09dc35ee: (-s ours) am 0cc2e9b2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '09dc35ee3b127bfec572e570c470d34897a1bf68':
  Import translations. DO NOT MERGE
 2012-08-30 22:22:11 -07:00
Baligh Uddin
09dc35ee3b am 0cc2e9b2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '0cc2e9b2e9ff3697388c966d658c9dc5a7293fda':
  Import translations. DO NOT MERGE
 2012-08-30 22:19:30 -07:00
Baligh Uddin
0cc2e9b2e9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-30 22:16:42 -07:00
Baligh Uddin
3af1cf3b23 Merge "Import translations. DO NOT MERGE" 2012-08-30 22:15:03 -07:00
rich cannings
6c197585c1 am d3fe930d: am a2875f48: Merge "Notify verifiers that verification is complete" into jb-mr1-dev 
* commit 'd3fe930da9199d7fde39e243ba9c695872c0622b':
  Notify verifiers that verification is complete
 2012-08-30 20:39:58 -07:00
rich cannings
d3fe930da9 am a2875f48: Merge "Notify verifiers that verification is complete" into jb-mr1-dev 
* commit 'a2875f481bc40fb5c7e5ae2d475dfb6d557294c0':
  Notify verifiers that verification is complete
 2012-08-30 20:36:56 -07:00
rich cannings
a2875f481b Merge "Notify verifiers that verification is complete" into jb-mr1-dev 2012-08-30 20:35:08 -07:00
Chet Haase
e91d03e256 am 983f71da: am 6cab6005: Merge "Make detachViewFromParent more robust" into jb-mr1-dev 
* commit '983f71da9c3b8a8a4a34818e111ab311abb4cfb7':
  Make detachViewFromParent more robust
 2012-08-30 19:58:44 -07:00
Chet Haase
983f71da9c am 6cab6005: Merge "Make detachViewFromParent more robust" into jb-mr1-dev 
* commit '6cab6005a8746bdf86fd98a2a004f08d9473a445':
  Make detachViewFromParent more robust
 2012-08-30 19:56:36 -07:00
Chet Haase
6cab6005a8 Merge "Make detachViewFromParent more robust" into jb-mr1-dev 2012-08-30 19:54:32 -07:00
Adam Powell
8ab556f1c0 am c8f2fcb5: am b2fc49bc: Merge "Integrate new assets from UX that include layout bounds." into jb-mr1-dev 
* commit 'c8f2fcb53505c68bda5af7d62774ba6adb62dfaa':
  Integrate new assets from UX that include layout bounds.
 2012-08-30 18:31:33 -07:00
Adam Powell
c8f2fcb535 am b2fc49bc: Merge "Integrate new assets from UX that include layout bounds." into jb-mr1-dev 
* commit 'b2fc49bceb13f8584e44c07a6416f1cbc7990006':
  Integrate new assets from UX that include layout bounds.
 2012-08-30 18:28:34 -07:00
Adam Powell
b2fc49bceb Merge "Integrate new assets from UX that include layout bounds." into jb-mr1-dev 2012-08-30 18:25:39 -07:00
Wink Saville
24697465ba am c25494a4: am a559f882: am 0e90f738: am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit 'c25494a4a125c4cade58c85eacce9c58a7b250c8':
  Fix code problem in writePidDns
 2012-08-30 18:20:28 -07:00
Wink Saville
c25494a4a1 am a559f882: am 0e90f738: am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit 'a559f8826f1f1f35a33fc86e30b8b2bf9a2267ba':
  Fix code problem in writePidDns
 2012-08-30 18:18:35 -07:00
Wink Saville
a559f8826f am 0e90f738: am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit '0e90f738aa82d9b30e6b4f43cd321e3f9cad2fc1':
  Fix code problem in writePidDns
 2012-08-30 18:16:30 -07:00
Wink Saville
0e90f738aa am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit 'f5311768e3dfdc6be60288363da4f120b0c88e28':
  Fix code problem in writePidDns
 2012-08-30 18:14:15 -07:00
Wink Saville
f5311768e3 am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit '0dab1a198e19c9993897b031d425a61a3bfec562':
  Fix code problem in writePidDns
 2012-08-30 18:11:30 -07:00
Adam Powell
dc2cf24ecf Integrate new assets from UX that include layout bounds. 
Change-Id: I682b3f693d8eedb741ea689f56363532cde32132
 2012-08-30 18:06:38 -07:00
Chet Haase
ca479d468b Make detachViewFromParent more robust 
Calling detachViewFromParent() without calling remove or attach in the
same drawing frame could, in some situations, cause a crash in the native
DisplayList code. detach/attach are intended to be very lightweight and do
not manage the native DisplayList content the same way that add/remove do.
Nor do they cause an invalidate() or requestLayout(), which would cause the
native structures to get recreated appropriately.

This fix makes this process more robust in two ways:
- DisplayLists should not get finalized (therefore destroying their native
structures) when there are still parent DisplayLists referring to them
(each DisplayList keeps references to its child DisplayLists). This will
prevent the native crash associated with unmatched detach*() calls.
- The docs for detach/attach have been enhanced to make it easier for
developers to understand how to use these methods more correctly and
successfully.

Issue #7064818 detachViewFromParent() should be more robust

Change-Id: I53befc04d5d58c225060f397725566d470488c9b
 2012-08-30 17:36:54 -07:00
Wink Saville
0dab1a198e Merge "Fix code problem in writePidDns" 2012-08-30 17:36:06 -07:00
Amith Yamasani
7ced19d5ce am b33ef6a2: am f203aeef: Enforce permissions for calls with specified userId 
* commit 'b33ef6a212c520d27fde88600c8f8c936b568446':
  Enforce permissions for calls with specified userId
 2012-08-30 17:31:43 -07:00
Amith Yamasani
b33ef6a212 am f203aeef: Enforce permissions for calls with specified userId 
* commit 'f203aeef993b0f4ce65c9630d06bbd50a504e89f':
  Enforce permissions for calls with specified userId
 2012-08-30 17:28:57 -07:00
Dianne Hackborn
99c8584954 am f4444412: am b2dd4e87: am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity." 
* commit 'f44444120b84da822077cddd4ed37359c7de7481':
  Added check of ActivityInfo launch mode when starting activity.
 2012-08-30 16:08:55 -07:00
Amith Yamasani
f203aeef99 Enforce permissions for calls with specified userId 
Fix a couple of places where incorrect userIds were being passed in.

Change-Id: I398c676e0488ff7e584be96e96c8b32652134238
 2012-08-30 16:08:23 -07:00
Dianne Hackborn
f44444120b am b2dd4e87: am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity." 
* commit 'b2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c':
  Added check of ActivityInfo launch mode when starting activity.
 2012-08-30 16:07:26 -07:00
Dianne Hackborn
b2dd4e87ae am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity." 
* commit '1a907db07ea105ea65e146713f436ed072d7084b':
  Added check of ActivityInfo launch mode when starting activity.
 2012-08-30 16:04:19 -07:00
Dianne Hackborn
1a907db07e am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity." 
* commit '862c383530d64e6c493fb519f567dd5778d9d48c':
  Added check of ActivityInfo launch mode when starting activity.
 2012-08-30 16:01:59 -07:00
rich cannings
d1b5cfc94a Notify verifiers that verification is complete 
Send the Intent.ACTION_PACKAGE_VERIFIED to all verifiers when
verification is complete (either one verifier verified the package or a
timeout occurred). Details of what occurred is in a new extra,
PackageManager.EXTRA_VERIFICATION_RESULT.

Bug: 7048930
Change-Id: I4f9855a29b0eb6d77f469891402c69e2e8922945
 2012-08-30 16:00:59 -07:00
Dianne Hackborn
862c383530 am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity." 
* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
  Added check of ActivityInfo launch mode when starting activity.
 2012-08-30 15:59:40 -07:00
Romain Guy
6528cdca41 am 3dd72c6d: am 0fa814d7: Merge "Don\'t quickReject() children if FLAG_CLIP_CHILDREN isn\'t set" into jb-mr1-dev 
* commit '3dd72c6db6d2051b67d7f953278ea770eebd1c73':
  Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
 2012-08-30 15:31:56 -07:00
Romain Guy
3dd72c6db6 am 0fa814d7: Merge "Don\'t quickReject() children if FLAG_CLIP_CHILDREN isn\'t set" into jb-mr1-dev 
* commit '0fa814d7e6d16e68fa715175cf3122b19fd9e59c':
  Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
 2012-08-30 15:30:07 -07:00
Romain Guy
0fa814d7e6 Merge "Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set" into jb-mr1-dev 2012-08-30 15:26:57 -07:00
Romain Guy
fbb4321b94 Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set 
External report: http://code.google.com/p/android/issues/detail?id=36788

Change-Id: Ibdaecf37ab013e30b16e9dc7a6e50156d72c3e4f
 2012-08-30 15:19:27 -07:00
Dianne Hackborn
4b60a8d1b8 Merge "Added check of ActivityInfo launch mode when starting activity." 2012-08-30 15:19:03 -07:00
Dianne Hackborn
7cd1bfa801 am f59dfc81: am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev 
* commit 'f59dfc81f4d1e91aa436ed70d7f8372bce3d91e0':
  Improve multi-user broadcasts.
 2012-08-30 15:01:28 -07:00
John Reck
fd26a08751 am 992ab48b: (-s ours) am d02239d1: am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev 
* commit '992ab48b6e1d206e091fe27100328178cd420535':
  DO NOT MERGE Remove dead code
 2012-08-30 15:01:24 -07:00
Teng-Hui Zhu
19762cf319 am e8102ec7: am 4dc187b4: Merge "Fix a typo in the sample code" into jb-mr1-dev 
* commit 'e8102ec7df921dd718a6c1803d59c27feb03ef9d':
  Fix a typo in the sample code
 2012-08-30 14:58:41 -07:00
Dianne Hackborn
f59dfc81f4 am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev 
* commit '73365695e4d169126c6932df8e8e932aefe6aaca':
  Improve multi-user broadcasts.
 2012-08-30 14:58:23 -07:00
John Reck
992ab48b6e am d02239d1: am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev 
* commit 'd02239d1c05054e4a1e06009410a933a45c24d3e':
  DO NOT MERGE Remove dead code
 2012-08-30 14:58:20 -07:00
Maxim Siniavine
03e6e5f4ba am e643ce67: am 92c0e375: Merge "Fixed MemoryUsage issue with reporting results." into jb-mr1-dev 
* commit 'e643ce67c95d7c73073882fd30a21e57ed4f98b7':
  Fixed MemoryUsage issue with reporting results.
 2012-08-30 14:57:06 -07:00
Teng-Hui Zhu
e8102ec7df am 4dc187b4: Merge "Fix a typo in the sample code" into jb-mr1-dev 
* commit '4dc187b43a77be3785c76f42c2fed598f4cee5da':
  Fix a typo in the sample code
 2012-08-30 14:56:37 -07:00
Dianne Hackborn
73365695e4 Merge "Improve multi-user broadcasts." into jb-mr1-dev 2012-08-30 14:56:11 -07:00
John Reck
d02239d1c0 am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev 
* commit '30b5bea07b7357b5063a12e54f002adae9af2b39':
  DO NOT MERGE Remove dead code
 2012-08-30 14:55:55 -07:00
Maxim Siniavine
e643ce67c9 am 92c0e375: Merge "Fixed MemoryUsage issue with reporting results." into jb-mr1-dev 
* commit '92c0e3757dd7800c9537483f9e7bc0165bc8bdd0':
  Fixed MemoryUsage issue with reporting results.
 2012-08-30 14:54:55 -07:00
Teng-Hui Zhu
4dc187b43a Merge "Fix a typo in the sample code" into jb-mr1-dev 2012-08-30 14:54:24 -07:00