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

34198 Commits

Author SHA1 Message Date
Fabrice Di Meglio
3736c23a67 am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 
* commit '8872465709d336083a908cb79d08661c6658265b':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
 2012-09-12 13:29:53 -07:00
Fabrice Di Meglio
8872465709 Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 2012-09-12 13:26:56 -07:00
Fabrice Di Meglio
8389991f90 am b9674640: Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 
* commit 'b967464049d7a75face9237a89903342c4724f8a':
  Enforce encapsulation for MarginLayoutParams startMargin and endMargin
 2012-09-12 13:26:40 -07:00
Fabrice Di Meglio
b967464049 Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 2012-09-12 13:25:22 -07:00
Selim Gurun
b92d26f307 am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 
* commit '4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6':
  Make JavascriptInterface annotation public.
 2012-09-12 12:51:02 -07:00
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Brian Carlstrom
55bf4c1406 am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 
* commit '743115ffcd5f7b04d8b485bbfc5440216c3aaf4f':
  Tracking upgrade to bouncycastle 1.47
 2012-09-12 11:24:11 -07:00
Brian Carlstrom
0efca17105 Tracking upgrade to bouncycastle 1.47 
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
 2012-09-12 10:01:00 -07:00
Kristian Monsen
e6b2a85ae0 am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 
* commit 'bd0fe8783407bc760b8e9a9952cb96a600d26ea9':
  Deprecating methods (and a constant) for JB MR1
 2012-09-12 09:36:51 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00
Selim Gurun
e91d5bee24 Make JavascriptInterface annotation public. 
Bug: 7073422

This change makes @JavascriptInterface public and it requires
using this annotation to allow javascript access to public java
methods for API level JELLY_BEAN_MR1 and above. The behavior
does not change for API levels JELLY_BEAN and below.

Change-Id: I4108b17cf71b9ac273d7b61b1c8f7f5581e922ee
 2012-09-12 08:04:26 -07:00
Jeff Sharkey
db2cc50b45 am 8b29d63d: Merge "Include user identifier in external storage paths." into jb-mr1-dev 
* commit '8b29d63d0857337057db707549ef1faed39792fd':
  Include user identifier in external storage paths.
 2012-09-11 23:38:38 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths. 
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
 2012-09-11 23:11:14 -07:00
Fabrice Di Meglio
be06e3292b Fix bug #7148393 Switch can crash when hierarchyviewer is connected 
Change-Id: I1713138a60358cc76f6cf373082a94199e85c717
 2012-09-11 17:42:45 -07:00
Fabrice Di Meglio
a40627daee Enforce encapsulation for MarginLayoutParams startMargin and endMargin 
Change-Id: Ibaf5ade22612dfa52173978e4b520a6407162d13
 2012-09-11 17:16:36 -07:00
Svetoslav Ganov
c010caef04 am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 
* commit '0bb4d078afeadf4996240d0ac41514c28e5f795a':
  Screen magnifier should handle window rebuilds correctly.
 2012-09-11 15:54:50 -07:00
Svetoslav Ganov
0bb4d078af Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 2012-09-11 15:52:33 -07:00
Svetoslav Ganov
9b4125e435 Screen magnifier should handle window rebuilds correctly. 
1. The way for computing the magnified region was simplistic and
   incorrect. It was ignoring window layering resulting in broken
   behavior. For example, if the IME is up, then the everything else
   is magnifed and the IME not. Now the keyguard appears and covers
   the IME but the magnified region does not expand while it would
   since the keyguard completely covers the not magnified IME window.

bug:7138937

Change-Id: I21414635aefab700ce75d40f3e913c1472cba202
 2012-09-11 15:50:58 -07:00
Christopher Tate
4a7e0fc604 am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev 
* commit '99c0cb3b9d9fe187879ed1e03a8cc850f1906cc9':
  Set up default (random) Android IDs for all users
 2012-09-11 15:23:16 -07:00
Christopher Tate
99c0cb3b9d Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev 2012-09-11 15:20:34 -07:00
Robert Greenwalt
e435859735 am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit 'f008ab727e46926bff018ef970ea8265ccc0f45d':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:11:41 -07:00
Robert Greenwalt
f008ab727e am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '5d33e76cff65245d03f592a3dbcbf2e17a2f1581':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:09:11 -07:00
Robert Greenwalt
5d33e76cff am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags" 
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
 2012-09-11 15:04:50 -07:00
Selim Gurun
86e628df36 am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev 
* commit '79ccb1e8a94eec580eea54db05a7ba246dbf6d92':
  Deleting the defunct SearchBox interface.
 2012-09-11 15:04:44 -07:00
Selim Gurun
79ccb1e8a9 Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev 2012-09-11 15:01:21 -07:00
Christopher Tate
4dc7a68dbe Set up default (random) Android IDs for all users 
Also correct some now-misleading terminology in a permission-check
log message, and fix a bug in which a system component trying to
write to a secondary user's settings would wind up writing the
owner's settings instead.

Bug 7132405

Change-Id: I5b8fafc35720390a01652e386ab5b7c0ad751abe
 2012-09-11 14:51:33 -07:00
Vishal Mahaveer
b6b72f5411 EthernetDataTracker: indicate link up based on flags 
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.

Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-09-11 16:41:16 -05:00
JP Abgrall
a1aef4a29f am d428e95e: Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev 
* commit 'd428e95eb5bb0fe9ee4984c89c28bea3aff1b259':
  core: config: Update the description of the autoBrightnessLevels array.
 2012-09-11 14:02:05 -07:00
JP Abgrall
d428e95eb5 Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev 2012-09-11 13:58:40 -07:00
Jeff Brown
fa4b55c6d5 am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev 
* commit '9ba2a188919e6e5bf8c042b26527fc090de677ef':
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
 2012-09-11 13:58:35 -07:00
Jeff Brown
9ba2a18891 Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev 
* changes:
  Don't auto-discover peers until scan requested.
  Use wfdInfo to filter available sinks.
  Allow adb shell am display-size to use bigger sizes.
 2012-09-11 13:56:04 -07:00
JP Abgrall
81985bcbe6 core: config: Update the description of the autoBrightnessLevels array. 
Clarify what the control point values are.

Change-Id: I33860c575b13e5216c804c7c76fa5733fcebf8ad
 2012-09-11 13:41:25 -07:00
Selim Gurun
a7094734ae Deleting the defunct SearchBox interface. 
Change-Id: Iecb698dbe942d3c9680ad1135ba0d604aa211856
 2012-09-11 13:27:08 -07:00
Selim Gurun
adb018106c am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev 
* commit 'faed98a161f58441ebce3dcb08cd8bf76a76da4e':
  Added annotations for injected accessibility objects
 2012-09-11 13:26:31 -07:00
Selim Gurun
faed98a161 Merge "Added annotations for injected accessibility objects" into jb-mr1-dev 2012-09-11 13:23:45 -07:00
Adam Cohen
48949f9f6d am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev 
* commit 'aec914b1301b9608053b77318c8ea86fa162f14d':
  Adding notion of keyguard widgets
 2012-09-11 13:19:58 -07:00
Adam Cohen
aec914b130 Merge "Adding notion of keyguard widgets" into jb-mr1-dev 2012-09-11 13:18:14 -07:00
Eino-Ville Talvala
cc9c7fa18a am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev 
* commit 'ff5c9146b53d8429f8ee778f193582c12da0d2b3':
  NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
 2012-09-11 12:43:48 -07:00
Eino-Ville Talvala
ff5c9146b5 Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev 2012-09-11 12:41:11 -07:00
Svetoslav Ganov
8a5623e981 am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev 
* commit 'c574fd04cc192fa30af5dd065c5d0cd4c50f8db4':
  Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
 2012-09-11 12:18:43 -07:00
Svetoslav Ganov
c574fd04cc Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev 2012-09-11 12:16:13 -07:00
Eino-Ville Talvala
7cfd7d5b65 NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR 
Bug: 7054970

Change-Id: I509fa18f1203022bb23cd9ef5c70cb3a3fbb8b77
 2012-09-11 11:34:59 -07:00
Selim Gurun
2eaa82b4da am 2fa10c67: Fix build break 
* commit '2fa10c675b42d22e73492154ca0ca1cbdbceaa3a':
  Fix build break
 2012-09-11 11:34:53 -07:00
Selim Gurun
2fa10c675b Fix build break 
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
 2012-09-11 11:32:44 -07:00
Eino-Ville Talvala
234e6a5fb1 am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev 
* commit 'a910390b7d64fba46e7c2034f7085b04e5268cab':
  Camera: Add SCENE_MODE_HDR.
 2012-09-11 11:22:43 -07:00
Fabrice Di Meglio
5e3b240f05 am 5cf8bd79: Merge "Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware" into jb-mr1-dev 
* commit '5cf8bd79bbdef0185574f0e3514124583ad537cd':
  Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware
 2012-09-11 11:21:04 -07:00
Eino-Ville Talvala
a910390b7d Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev 2012-09-11 11:20:09 -07:00
Fabrice Di Meglio
5cf8bd79bb Merge "Fix bug #7141044 GlobalActions dialog (power off / airplane mode / sound off) should be RTL aware" into jb-mr1-dev 2012-09-11 11:18:15 -07:00
Amith Yamasani
dc0845b165 am 8015f039: Merge "Enforce a user limit" into jb-mr1-dev 
* commit '8015f039c744fb59c14920550705af958fc3c86d':
  Enforce a user limit
 2012-09-11 11:11:31 -07:00