Scott Main
6434d73376
am 91de90da: am 01f9bf3f: small update to the ADT installation steps based on new ADT UI
...
* commit '91de90daad1147e1472691211a74c4ad1c17a612':
small update to the ADT installation steps based on new ADT UI
2012-09-11 15:43:53 -07:00
Scott Main
91de90daad
am 01f9bf3f: small update to the ADT installation steps based on new ADT UI
...
* commit '01f9bf3fefd7e78f8356cfcb18e945f58e6eb38b':
small update to the ADT installation steps based on new ADT UI
2012-09-11 15:41:58 -07:00
Jason Sams
1e26a8b358
Merge "LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test" into jb-mr1-dev
2012-09-11 15:39:18 -07:00
Scott Main
01f9bf3fef
small update to the ADT installation steps based on new ADT UI
...
Change-Id: I1c3ddfcb6188dd0bdc87a2b2e8241dfd7fcaa4dc
2012-09-11 15:24: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
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
Robert Greenwalt
2415841c37
Merge "EthernetDataTracker: indicate link up based on flags"
2012-09-11 15:02:24 -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
d428e95eb5
Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev
2012-09-11 13:58:40 -07:00
Jim Miller
752ef4e0f8
Merge "This enables the back button in keyguard" into jb-mr1-dev
2012-09-11 13:58:40 -07:00
Adam Cohen
b0246ce14a
Merge "Fixing build (update-api)" into jb-mr1-dev
2012-09-11 13:56:38 -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
Adam Cohen
2071e8408a
Fixing build (update-api)
...
Change-Id: I78738cc8320dab1fde082bfa9f65d020c6573de7
2012-09-11 13:54:07 -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
faed98a161
Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
2012-09-11 13:23:45 -07:00
Wink Saville
ea4f446a81
am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
...
* commit '72c06bcf1970f615f5037b9f63759d06a527cb4e':
Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:21:38 -07:00
Wink Saville
72c06bcf19
am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
...
* commit '0c99f7e36da7ebc92d0a084f3dc1717a7c31423e':
Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:19:18 -07:00
Adam Cohen
aec914b130
Merge "Adding notion of keyguard widgets" into jb-mr1-dev
2012-09-11 13:18:14 -07:00
Wink Saville
0c99f7e36d
am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
...
* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:17:17 -07:00
Jim Miller
ea42443e35
Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev
2012-09-11 13:08:18 -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
Wink Saville
ba3cf72a08
Merge "Telephony: Clarify IccCardConstants.State enum"
2012-09-11 12:24:15 -07:00
Jeff Brown
59c53c6224
Don't auto-discover peers until scan requested.
...
Change-Id: I4ad08873567a5ac86e9bd46abd2375b183e2e95b
2012-09-11 12:21:55 -07:00
Jeff Brown
0f68d166e6
Use wfdInfo to filter available sinks.
...
Change-Id: If056267738f70835af645a8c6e7a91c0c5407816
2012-09-11 12:18:15 -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
2fa10c675b
Fix build break
...
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
2012-09-11 11:32:44 -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
Kenny Root
a36180925b
Merge "Remove "unlinklib" command from installd" into jb-mr1-dev
2012-09-11 11:13:53 -07:00
Amith Yamasani
8015f039c7
Merge "Enforce a user limit" into jb-mr1-dev
2012-09-11 11:08:38 -07:00
Eino-Ville Talvala
6fc7275d0e
Merge "Camera: Add enableShutterSound method." into jb-mr1-dev
2012-09-11 11:06:13 -07:00
Selim Gurun
06ee8cdec5
Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev
2012-09-11 11:01:32 -07:00
Irfan Sheriff
f625436cc7
Merge "Handle ascii encoded SSID" into jb-mr1-dev
2012-09-11 11:00:10 -07:00
Amith Yamasani
faea76ff8b
Enforce a user limit
...
By default only 1 user is allowed. Some devices permit more than 1.
Set the real user limit in a device overlay for config.xml
Change-Id: I2e0bffa13393b954fcd20e55b92f20de980c58c0
2012-09-11 10:59:48 -07:00
Mike Lockwood
25da9375fd
Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev
2012-09-11 10:57:41 -07:00
Kenny Root
9bbd70a963
Remove "unlinklib" command from installd
...
unlinklib is no longer necessary since libraries are now either stored
in an ASEC container or in /data/app-lib
Replace lib directory with a symlink to the /data/app-lib directory even
if it's a dangling link. That way developers don't name something "lib"
in their directory which gets blown away during an update.
Change-Id: I142cf13dba9c13aafbaf0ff8d5e9872cbf1cc910
2012-09-11 10:55:17 -07:00
Adam Cohen
0aa2d42e87
Adding notion of keyguard widgets
...
-> Persisting certain appwidget options
-> Adding ability to specify appwidget options on bind
so as to avoid AppWidgetProvider update call with no
options.
Change-Id: I5631039f19f1822b8e123b559b6353c880c0192e
2012-09-11 10:53:57 -07:00
Scott Main
8b9e467dfb
am c02b5008: am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev
...
* commit 'c02b5008c109f4d3057de1bab8b7ac0478208816':
docs: update for multi apk doc for ABI support
2012-09-11 10:53:24 -07:00
Scott Main
c02b5008c1
am c0e0d2bf: Merge "docs: update for multi apk doc for ABI support" into jb-dev
...
* commit 'c0e0d2bf3db18eaa2b94608654784cad29f96b23':
docs: update for multi apk doc for ABI support
2012-09-11 10:50:40 -07:00
Irfan Sheriff
b6deeed3ce
Handle ascii encoded SSID
...
Supplicant now passes as an ascii encoded string that allows it to
pass any sequence of bytes for a SSID. see src/utils/common.c in supplicant
for details of the implementation.
We create a SSID structure WifiSsid in framework to store the ssid and handle
the conversion appropriately when required for printing and for an application.
At this point, we still do not handle non-printable octets from an application perspective
for connectivity
Bug: 7110903
Change-Id: I520e5ee23baed4867b8b408bbb3eda5c9e92b6bf
2012-09-11 10:50:04 -07:00
Mike Lockwood
58e6831ccb
MtpDatabase: Fix typo affecting parent and format queries
...
Bug: 7114350
Change-Id: I80269cfcebf521ea13cae30c1c9bd477d76adbd1
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-09-11 10:49:34 -07:00
Scott Main
c0e0d2bf3d
Merge "docs: update for multi apk doc for ABI support" into jb-dev
2012-09-11 10:48:16 -07:00
Selim Gurun
0e9292b94a
Remove defunct searchbox implementation from webview.
...
The search box implementation has not been in use since ICS. This
removes dead code from webview.
Change-Id: I8a28eeeec556619abc4a902a3abec2ac52bad319
2012-09-11 10:40:28 -07:00
Jean-Michel Trivi
660c8a115b
Merge "Add support for controlling remote submix audio routing" into jb-mr1-dev
2012-09-11 10:36:54 -07:00