126299 Commits

Author SHA1 Message Date
Marco Nelissen
759445c5bd resolved conflicts for merge of c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
2014-03-20 12:51:55 -07:00
Christopher Tate
6b904c8ffd Merge "App widget backup/restore infrastructure" 2014-03-20 19:51:07 +00:00
Vinit Deshapnde
ffb3e595cc am bb7fdd6e: am b876cae9: am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit 'bb7fdd6e0a421ae31cf46002398a705235bb7916':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
2014-03-20 19:47:42 +00:00
Vinit Deshapnde
bb7fdd6e0a am b876cae9: am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit 'b876cae90d8e7e57a685e31cd3b347c325728823':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
2014-03-20 19:42:08 +00:00
Vinit Deshapnde
b876cae90d am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
2014-03-20 19:36:59 +00:00
Mike Lockwood
d8be49089f UsbDeviceManager: A better fix for race condition when starting USB accessory mode
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received.  However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode.  To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received.  Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.

Bug: 13393825

Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
2014-03-20 12:36:51 -07:00
Mike Lockwood
205a3ea0e2 Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
This reverts commit fbd5521fb5e94fad066e21b9f91f4782afe71660.

This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start".  So we revert this change and will replace it with a better fix.

Bug: 13535051
Bug: 13393825

Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
2014-03-20 12:36:34 -07:00
Svetoslav
160c9c8ecd Merge "Fixing the build for real." 2014-03-20 19:32:56 +00:00
Vinit Deshapnde
f92b00722d am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '52bc363cf3a7de8431cfbb370f0fd3adeecaed52':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
2014-03-20 19:31:42 +00:00
Svetoslav
edf034decf Fixing the build for real.
Change-Id: I2ddba0e8cba4c847c3dedccb800b9409882fea12
2014-03-20 12:31:15 -07:00
Christopher Tate
adfe8b86e9 App widget backup/restore infrastructure
Backup/restore now supports app widgets.

An application involved with app widgets, either hosting or publishing,
now has associated data in its backup dataset related to the state of
widget instantiation on the ancestral device.  That data is processed
by the OS during restore so that the matching widget instances can be
"automatically" regenerated.

To take advantage of this facility, widget-using apps need to do two
things:  first, implement a backup agent and store whatever widget
state they need to properly deal with them post-restore (e.g. the
widget instance size & location, for a host); and second, implement
handlers for new AppWidgetManager broadcasts that describe how to
translate ancestral-dataset widget id numbers to the post-restore
world.  Note that a host or provider doesn't technically need to
store *any* data on its own via its agent; it just needs to opt in
to the backup/restore process by publishing an agent.  The OS will
then store a small amount of data on behalf of each widget-savvy
app within the backup dataset, and act on that data at restore time.

The broadcasts are AppWidgetManager.ACTION_APPWIDGET_RESTORED and
ACTION_APPWIDGET_HOST_RESTORED, and have three associated extras:

    EXTRA_APPWIDGET_OLD_IDS
    EXTRA_APPWIDGET_IDS
    EXTRA_HOST_ID [for the host-side broadcast]

The first two are same-sized arrays of integer widget IDs.  The
_OLD_IDS values are the widget IDs as known to the ancestral device.
The _IDS array holds the corresponding widget IDs in the new post-
restore environment.  The app should simply update the stored
widget IDs in its bookkeeping to the new values, and things are
off and running.  The HOST_ID extra, as one might expect, is the
app-defined host ID value of the particular host instance which
has just been restored.

The broadcasts are sent following the conclusion of the overall
restore pass.  This is because the restore might have occurred in a
tightly restricted lifecycle environment without content providers
or the package's custom Application class.  The _RESTORED broadcast,
however, is always delivered into a normal application environment,
so that the app can use its content provider etc as expected.

*All* widget instances that were processed over the course of the
system restore are indicated in the _RESTORED broadcast, even if
the backing provider or host is not yet installed.  The widget
participant is responsible for understanding that these are
promises that might be fulfilled later rather than necessarily
reflecting the immediate presentable widget state.  (Remember
that following a cloud restore, apps may be installed piecemeal
over a lengthy period of time.)  Telling the hosts up front
about all intended widget instances allows them to show placeholder
UI or similarly useful information rather than surprising the user
with piecemeal unexpected appearances.

The AppWidgetProvider helper class has been updated to add a new
callback, onRestored(...), invoked when the _RESTORED broadcast
is received.  The call to onRestored() is immediately followed by
an invocation of onUpdate() for the affected widgets because
they will need to have their RemoteViews regenerated under the
new ID values.

Bug 10622506
Bug 10707117

Change-Id: Ie0007cdf809600b880d91989c00c3c3b8a4f988b
2014-03-20 12:30:51 -07:00
Vinit Deshapnde
52bc363cf3 Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 2014-03-20 19:26:44 +00:00
Baligh Uddin
576b6f2c25 Fix Build 2014-03-20 12:26:04 -07:00
Baligh Uddin
5c43c35790 am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c2221b93b983638d58fe80c88ed81ff67e25a74b':
  Import translations. DO NOT MERGE
2014-03-20 19:13:02 +00:00
Baligh Uddin
c2221b93b9 am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ecf3c574a8cedd3b104b41623d192d61cb039710':
  Import translations. DO NOT MERGE
2014-03-20 19:09:09 +00:00
Baligh Uddin
ecf3c574a8 am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '826f3647a4a44ffcf154c63fe204a7787b96a657':
  Import translations. DO NOT MERGE
2014-03-20 19:02:28 +00:00
Svetoslav
aef4f6ebc8 Merge "Fix build" 2014-03-20 18:39:44 +00:00
Svetoslav
a053d095ae Fix build
Change-Id: Icde98afd1471295320dc9042e1ecf680bb88ebd2
2014-03-20 11:39:13 -07:00
Baligh Uddin
826f3647a4 am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd16505da8676b54dd354da278b1888f28257028b':
  Import translations. DO NOT MERGE
2014-03-20 18:37:14 +00:00
Baligh Uddin
56b0306142 Merge "Import translations. DO NOT MERGE" 2014-03-20 18:32:39 +00:00
Baligh Uddin
e09c974a3d Merge "Import translations. DO NOT MERGE" 2014-03-20 18:32:37 +00:00
Baligh Uddin
d16505da86 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-20 18:32:35 +00:00
Baligh Uddin
54d401113e Merge "Import translations. DO NOT MERGE" 2014-03-20 18:32:30 +00:00
Baligh Uddin
a2bf5abc80 Merge "Import translations. DO NOT MERGE" 2014-03-20 18:32:27 +00:00
Baligh Uddin
c0bbb54296 Merge "Import translations. DO NOT MERGE" 2014-03-20 18:32:27 +00:00
Baligh Uddin
afb553f473 Merge "Import translations. DO NOT MERGE" 2014-03-20 18:32:24 +00:00
Colin Cross
7acd69be86 MediaHTTPConnection: fix JNI signature
mNativeContext was changed to a long, fix the GetFieldID signature

Change-Id: Ib19605d2c534a2aea7d75ab105349710905d716f
2014-03-20 11:23:29 -07:00
Paul Lawrence
8f1b194887 Merge "BatteryProperty: Add battery capacity property" 2014-03-20 18:11:29 +00:00
Marco Nelissen
c53ad4cd80 am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c':
  Verify certificates
2014-03-20 11:11:16 -07:00
Paul Lawrence
5a43cc6ddd BatteryProperty: Add battery capacity property
Match change in native code
  https://googleplex-android-review.git.corp.google.com/#/c/427553/

Change-Id: I0049ccbbef59fbbc0e14b50b9af7481d87a6d48c
2014-03-20 18:10:06 +00:00
Marco Nelissen
072e1da26e am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit 'b17cf207372268d91177de7efa692b2483785991':
  Verify certificates
2014-03-20 11:06:41 -07:00
Marco Nelissen
b17cf20737 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
  Verify certificates
2014-03-20 10:54:38 -07:00
Colin Cross
a3633c2503 am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit '71a3d40d20c9507efab94260431e330558b90cd0':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
2014-03-20 17:52:31 +00:00
Marco Nelissen
9ee72b6543 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
  Verify certificates
2014-03-20 10:51:35 -07:00
Marco Nelissen
665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev
* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates
2014-03-20 10:47:34 -07:00
Colin Cross
71a3d40d20 am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit 'e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
2014-03-20 17:46:50 +00:00
Colin Cross
e4360c8e14 am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit '4308a5230e2887c1ee12e7bdc60e0b93212637ab':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
2014-03-20 10:33:20 -07:00
Colin Cross
4308a5230e Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 2014-03-20 17:28:12 +00:00
Marco Nelissen
81fbdade8d resolved conflicts for merge of 534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
2014-03-20 10:27:58 -07:00
Svetoslav
503fb80d0e Fix build
Change-Id: I2b27d51d8f555ee160dc99dba7e223f1cb3557e7
2014-03-20 10:22:41 -07:00
Dianne Hackborn
466ce96da8 Get rid of not specifying a user errors in bluetooth.
W/ContextImpl( 1772): Calling a method in the system process without a qualified user: android.app.ContextImpl.bindService:1559 android.content.ContextWrapper.bindService:513 android.bluetooth.BluetoothInputDevice.doBind:262 android.bluetooth.BluetoothInputDevice.<init>:255 android.bluetooth.BluetoothAdapter.getProfileProxy:1365
W/ContextImpl( 1772): Calling a method in the system process without a qualified user: android.app.ContextImpl.bindService:1559 android.content.ContextWrapper.bindService:513 android.bluetooth.BluetoothPan.doBind:148 android.bluetooth.BluetoothPan.<init>:140 android.bluetooth.BluetoothAdapter.getProfileProxy:1368
W/ContextImpl( 1772): Calling a method in the system process without a qualified user: android.app.ContextImpl.bindService:1559 android.content.ContextWrapper.bindService:513 android.bluetooth.BluetoothMap.doBind:108 android.bluetooth.BluetoothMap.<init>:101 android.bluetooth.BluetoothAdapter.getProfileProxy:1374
W/ContextImpl( 1772): Calling a method in the system process without a qualified user: android.app.ContextImpl.bindService:1559 android.content.ContextWrapper.bindService:513 android.bluetooth.BluetoothPbap.doBind:163 android.bluetooth.BluetoothPbap.<init>:156 com.android.settings.bluetooth.PbapServerProfile.<init>:68

Change-Id: I0a1e24ee71aef7d796fcee5692b9d19462a93637
2014-03-20 10:10:03 -07:00
Adam Koch
c5640ea55a am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '065b8fd1c388812a789be48aaa0a0f7918d2755d':
  Point bitmaps training class to new samples directory.
2014-03-20 17:09:33 +00:00
Scott Main
51daba32e0 am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit 'd4d42af5c5ee62c8c53b87b3794cf5d762d2e67d':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
2014-03-20 17:09:30 +00:00
Wei Wang
34c40cab3e am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
* commit '331ef6127cd9df4a2d2a32178121e4b412ed9239':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
2014-03-20 17:09:28 +00:00
Adam Koch
065b8fd1c3 am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '8bc12a514918deb5cee9832d9d129c8ed3f7fb4b':
  Point bitmaps training class to new samples directory.
2014-03-20 17:05:26 +00:00
Scott Main
d4d42af5c5 am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit 'df00735c6791811534d3d2e2790a0dcf7daffcf1':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
2014-03-20 17:05:23 +00:00
Wei Wang
331ef6127c am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
* commit '32779536bcd66d45019f4ab80dd0d844e618e16b':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
2014-03-20 17:05:20 +00:00
Marco Nelissen
534f3e9438 am a3337bc7: Merge "Verify certificates" into jb-dev
* commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
  Verify certificates
2014-03-20 10:04:23 -07:00
Adam Koch
8bc12a5149 am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '5a510a2c3e0ec5f2e60577c7a57e60c2101ee354':
  Point bitmaps training class to new samples directory.
2014-03-20 16:59:23 +00:00
Scott Main
df00735c67 am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit 'e02d5a20ede8a6ac46e7b60cc0b258d42e224087':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
2014-03-20 16:59:19 +00:00