Lorenzo Colitti
743218d7a1
Merge "Display signal strength on data-only SIMs." into klp-dev
2013-08-20 01:17:31 +00:00
Tom O'Neill
1f48b78e99
Add the API to set and read the location mode
...
- This will be more future-proof than the current GPS/NLP API
Change-Id: I9defe505e1372d9b601c3190eb49bd71604f04d1
2013-08-19 18:14:56 -07:00
Eric Laurent
6f1fda90a9
am 51d9652d: Merge "Revert "Fix media server restart detection mechanism"" into klp-dev
...
* commit '51d9652d45ec0a22b625a8529479ba61cdb55314':
Revert "Fix media server restart detection mechanism"
2013-08-19 18:13:25 -07:00
Eric Laurent
51d9652d45
Merge "Revert "Fix media server restart detection mechanism"" into klp-dev
2013-08-20 01:11:50 +00:00
Eric Laurent
539719a7af
Revert "Fix media server restart detection mechanism"
...
This reverts commit ca35e4823459189dd57ec5472caf3a617d03b568.
2013-08-19 17:44:30 -07:00
Jeff Brown
0bcd404542
am 194c140c: Merge changes Id3815fe8,I90a85921 into klp-dev
...
* commit '194c140c34d9f4874c64839c2e20ef61f41cbb97':
Define AudioSource.REMOTE_SUBMIX.
Remove setRemoteSubmixOn method.
2013-08-19 17:01:22 -07:00
Joe Fernandez
b8e6513e3b
am 974e5975: am cf3aff67: am d1037efe: am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
...
* commit '974e5975d3bc16fd5b0db535ec825c045995d0fc':
Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:57:51 -07:00
Jeff Brown
194c140c34
Merge changes Id3815fe8,I90a85921 into klp-dev
...
* changes:
Define AudioSource.REMOTE_SUBMIX.
Remove setRemoteSubmixOn method.
2013-08-19 23:57:11 +00:00
Joe Fernandez
974e5975d3
am cf3aff67: am d1037efe: am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
...
* commit 'cf3aff672ce9d7240de1e2e3cc98f21f833957ec':
Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:55:10 -07:00
Joe Fernandez
cf3aff672c
am d1037efe: am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
...
* commit 'd1037efe7edcc202c84cfd8a74c4593d1d03ea2d':
Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:53:00 -07:00
Joe Fernandez
d1037efe7e
am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
...
* commit '9d237204da9b000c5debfa1f5650d13a545bb7c8':
Android 4.3 Platform Google APIs r2 system image Release Notes
2013-08-19 16:49:44 -07:00
Joe Fernandez
9d237204da
Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
2013-08-19 23:47:24 +00:00
Alan Viverette
058ac7cfe5
Use MULTI_LINE and OPENS_POPUP accessibility properties
...
BUG: 10391326
Change-Id: Ib2deeeef401802b6dde646e14ee5367141469a58
2013-08-19 16:44:30 -07:00
Joe Fernandez
312d29ed3d
Android 4.3 Platform Google APIs r2 system image Release Notes
...
Google APIs System image update with Google Play Services 3.2.25
Change-Id: Iac6987a9dcb55bd971da9ca57c5a5dae0c357be5
2013-08-19 16:43:57 -07:00
Jeff Brown
64dfb604e7
Define AudioSource.REMOTE_SUBMIX.
...
Add an API to allow applications to record from the remote
submix when they have the required permissions.
Bug: 10265163
Change-Id: Id3815fe82a6713e058ce4b8ab6128a898481df7e
2013-08-19 16:42:07 -07:00
Alan Viverette
02f5680363
Add implicit parent dependency for Preferences
...
Also removes unused dependency change listener interface.
BUG: 10117838
Change-Id: I03f0eb37e7ba69942f7997a8b32adb38a3dee0bd
2013-08-19 16:32:56 -07:00
Craig Mautner
7b88aa7c12
am 00775127: Merge "Notify ViewRootImpl when it\'s safe to modify Canvas." into klp-dev
...
* commit '007751276c210c39bd405ae9fa69854e67e80951':
Notify ViewRootImpl when it's safe to modify Canvas.
2013-08-19 16:16:27 -07:00
Craig Mautner
007751276c
Merge "Notify ViewRootImpl when it's safe to modify Canvas." into klp-dev
2013-08-19 23:13:47 +00:00
John Du
48f8b5dbf6
Change abortReliableWrite(BluetoothDevice) to abortReliableWrite()
...
BluetoothGatt.abortReliableWrite() should not take a BluetoothDevice
parameter. Instead, it should use mDevice instance variable.
bug 10152994
Change-Id: I7fc79b9011cf878414128cc9f1696e5ccc597056
2013-08-19 16:01:24 -07:00
Craig Mautner
bc57cd1b24
Notify ViewRootImpl when it's safe to modify Canvas.
...
When Activity.convert{To|From}Translucent() is called the
ViewRootImpl is now notified when it is safe to convert the Canvas
from translucent to opaque and back to translucent. This will make
it possible to save resources when compositing opaque layers.
Fixes bug 10349536.
Change-Id: I7282aee1d54601fb00611d20be204bf164d873f6
2013-08-19 15:47:42 -07:00
Eino-Ville Talvala
b5d5099b02
am b6c38e9d: Camera2: Remove redundant Keys classes
...
* commit 'b6c38e9de1a2824ce599d7074fa4a226926177c1':
Camera2: Remove redundant Keys classes
2013-08-19 13:54:17 -07:00
Eino-Ville Talvala
b6c38e9de1
Camera2: Remove redundant Keys classes
...
Also update tests accordingly
Bug: 10345522
Change-Id: I8c7d17cdfbda6faba09134745a96089bf1b70cb7
2013-08-19 20:37:37 +00:00
Svetoslav
269403b032
Implemented advanced printer selection and API refactoring.
...
1. Added past printer history tracking and merging favorite printers
with discovered printers.
2. Added save as PDF support.
3. Added all printers activity with search capability and optional
add printers chooser (if any print service provides add printers
activity)
4. Refactored the printer discovery session APIs. Now one session
can have multiple window discovery windows and the session stores
the printers found during past discovery periods.
5. Merged the print spooler and the print spooler service - much
simpler and easier to maintain.
Change-Id: I4830b0eb6367e1c748b768a5ea9ea11baf36cfad
2013-08-19 13:24:11 -07:00
Martijn Coenen
b4ed624996
am b6e89439: Merge "NFC: Allow HostApduService to indicate transaction unhandled." into klp-dev
...
* commit 'b6e8943933f745f5e3f248ac058fc8dbca8f8ab1':
NFC: Allow HostApduService to indicate transaction unhandled.
2013-08-19 13:16:34 -07:00
Tom O'Neill
184e75146c
Warn that SettingInjectorService must be fast
...
- Move UPDATE_INTENT to SettingInjectorSErvice
Change-Id: I9c8f8dc0878647a051cb852721b3436e9d55b391
2013-08-19 13:13:21 -07:00
Martijn Coenen
b6e8943933
Merge "NFC: Allow HostApduService to indicate transaction unhandled." into klp-dev
2013-08-19 20:11:09 +00:00
Jeff Sharkey
f39b8d2c22
am 6b73eb28: Merge "Request more documents when EXTRA_HAS_MORE." into klp-dev
...
* commit '6b73eb28d734e9dd65d3551e43f7c41445fdc8c9':
Request more documents when EXTRA_HAS_MORE.
2013-08-19 13:02:21 -07:00
Jeff Sharkey
6b73eb28d7
Merge "Request more documents when EXTRA_HAS_MORE." into klp-dev
2013-08-19 19:58:56 +00:00
Jeff Sharkey
dd5b9e38bb
am f7e2a2e9: Merge "Management actions, invalidate caches." into klp-dev
...
* commit 'f7e2a2e96321f56c53cad01a69bd71b281900030':
Management actions, invalidate caches.
2013-08-19 12:58:43 -07:00
Jeff Sharkey
f7e2a2e963
Merge "Management actions, invalidate caches." into klp-dev
2013-08-19 19:55:20 +00:00
Alan Viverette
ad9793501d
am 92d2a318: Merge "Remove duplicate sealed node checks, add missing checks" into klp-dev
...
* commit '92d2a318074d8c5400d93bccfa6c5282125401ee':
Remove duplicate sealed node checks, add missing checks
2013-08-19 12:51:53 -07:00
Alan Viverette
92d2a31807
Merge "Remove duplicate sealed node checks, add missing checks" into klp-dev
2013-08-19 19:50:29 +00:00
Alan Viverette
df39cb9b05
Remove duplicate sealed node checks, add missing checks
...
Change-Id: Icbe79ba4b74776f845b43f261624d0dbeda4250b
2013-08-19 12:28:04 -07:00
Dirk Dougherty
9c057eb613
am cb13399c: am 2d9ee707: am 364fe3a8: am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
...
* commit 'cb13399c1b3a0067a6b5b81cd3dc3833a5e9dcd9':
doc change: Samples browsing first changes: Samples dir and file starters.
2013-08-19 12:15:52 -07:00
Vinit Deshapnde
25322957c2
am 4d0145ad: Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev
...
* commit '4d0145add16bccb6b0f4a7d767a0b052f1b6bb04':
Expose WifiManager.setTdlsEnabled public API
2013-08-19 12:15:49 -07:00
Eino-Ville Talvala
d5780f4aaa
am f55916bd: Merge changes I6d125624,I549a9211 into klp-dev
...
* commit 'f55916bd31bb79dd47739115b26c0886f9523756':
Camera2: Fixed issue with HashSet not being initialized
Camera2: Documentation fixes, mostly capitalization mistakes
2013-08-19 12:15:46 -07:00
Dirk Dougherty
cb13399c1b
am 2d9ee707: am 364fe3a8: am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
...
* commit '2d9ee70703cb52a16d726eb177f6f4e0be4f93e2':
doc change: Samples browsing first changes: Samples dir and file starters.
2013-08-19 12:14:17 -07:00
Vinit Deshapnde
4d0145add1
Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev
2013-08-19 19:14:03 +00:00
Eino-Ville Talvala
f55916bd31
Merge changes I6d125624,I549a9211 into klp-dev
...
* changes:
Camera2: Fixed issue with HashSet not being initialized
Camera2: Documentation fixes, mostly capitalization mistakes
2013-08-19 19:12:53 +00:00
Dirk Dougherty
2d9ee70703
am 364fe3a8: am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
...
* commit '364fe3a856e7bd0c0a35724c2f42d381d8616370':
doc change: Samples browsing first changes: Samples dir and file starters.
2013-08-19 12:12:05 -07:00
Dirk Dougherty
364fe3a856
am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
...
* commit 'b6bc020d728960dc876a510c9e40cc441a9a9b6b':
doc change: Samples browsing first changes: Samples dir and file starters.
2013-08-19 12:09:45 -07:00
Tim Murray
d8c8aaa82e
Handle updates to C++ API.
...
Change-Id: I8ab17cbae3a9a4cc3c3202b8277d49f27bdf1fec
2013-08-19 12:07:52 -07:00
Martijn Coenen
583fe9d22b
NFC: Allow HostApduService to indicate transaction unhandled.
...
This will cause the OS to show UI that allows the user to pick
another application that could potentially handle the transaction.
Also, tweak processCommandApdu() method to take a Bundle to be more
future-proof.
Bug: 10262585
Change-Id: If9d060341b472fac0349f539c04b87e85fe79dfb
2013-08-19 11:52:27 -07:00
Baligh Uddin
423ba5163a
am 7e7f8d48: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '7e7f8d48a62a972ad18af2d222a011a1dd0c8928':
Import translations. DO NOT MERGE
2013-08-19 11:43:20 -07:00
Baligh Uddin
d68ad8f5ea
am f1967404: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'f19674045af1e0436b4d30e637eaa229cb64d2d0':
Import translations. DO NOT MERGE
2013-08-19 11:43:17 -07:00
Baligh Uddin
7e7f8d48a6
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-19 18:38:51 +00:00
Baligh Uddin
f19674045a
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-19 18:37:08 +00:00
Dirk Dougherty
b6bc020d72
doc change: Samples browsing first changes: Samples dir and file starters.
...
Change-Id: I6cc8c03bf4c2bcc771d4531619db5b3acd62601f
2013-08-19 11:19:38 -07:00
Elliott Hughes
8367eddcaf
am b9348927: Merge "Remove a fixed-length buffer in the wifi code." into klp-dev
...
* commit 'b93489270d41bbaf513f0018164ab8b6d6ca9519':
Remove a fixed-length buffer in the wifi code.
2013-08-19 11:11:57 -07:00
Elliott Hughes
b93489270d
Merge "Remove a fixed-length buffer in the wifi code." into klp-dev
2013-08-19 18:08:49 +00:00