Matthew Xie
a20d58182e
am 3f84b7b1: am 26cd4d65: Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev
...
* commit '3f84b7b17df5e4b020fd67351efdb30635372e69':
Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
2013-04-03 20:23:54 -07:00
Matthew Xie
3f84b7b17d
am 26cd4d65: Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev
...
* commit '26cd4d658f5c4e99c31107cef78698c818e54577':
Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
2013-04-03 20:19:51 -07:00
Matthew Xie
26cd4d658f
Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev
2013-04-04 03:16:40 +00:00
Matthew Xie
33ec9840c7
Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
...
Change name of BluetoothDevice#connectGattServer to BluetoothDevice#connectGatt
Add BluetoothGatt#getDevice to retrieve device from BluetoothGatt
Add BluetoothGatt#connect() to reconnect back to the server.
Make BluetoothGatt#close() public to clean up/unregister callback
Add BluetoothDevice.getType() to return int of
bug 8529188
Change-Id: Iebd9ac68cc7a64c43972e617dd3068f66c8ea0b2
2013-04-03 18:20:13 -07:00
kmccormick
c9728cfa2a
am 22da6f04: am e10b600d: am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
...
* commit '22da6f04b33173be9e6aacabc29869998395d271':
Doc update: unterminated code tags
2013-04-03 18:14:08 -07:00
kmccormick
22da6f04b3
am e10b600d: am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
...
* commit 'e10b600d5da413f9633ed97aefcdbd3f949637a5':
Doc update: unterminated code tags
2013-04-03 18:10:40 -07:00
kmccormick
e10b600d5d
am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
...
* commit '984f94ee4c4ef0196d9b2c149d0a42f20b72bebf':
Doc update: unterminated code tags
2013-04-03 18:06:40 -07:00
Jeff Brown
739d5507e0
am 6d21e404: am 41c07671: Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev
...
* commit '6d21e404ce834779b061fb519d85c9f95dccfd3d':
Clear mCurSender when mCurChannel is modified.
2013-04-03 18:05:41 -07:00
kmccormick
984f94ee4c
am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
...
* commit 'f29ca256a4340a3d550d2c4a39a2e6a29a3ce850':
Doc update: unterminated code tags
2013-04-03 18:03:00 -07:00
kmccormick
f29ca256a4
am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
...
* commit '57b73b4a1d6ea84ae42c407ecb258829ab8dfa2c':
Doc update: unterminated code tags
2013-04-03 18:00:11 -07:00
kmccormick
b461a13f25
Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
2013-04-04 00:52:26 +00:00
kmccormick
43d5abbf03
Doc update: unterminated code tags
...
"Bug: 7250069"
Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d
2013-04-03 17:43:44 -07:00
Jeff Brown
6d21e404ce
am 41c07671: Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev
...
* commit '41c076715da58990dc9b0be749bba28fc75d3b78':
Clear mCurSender when mCurChannel is modified.
2013-04-03 17:03:40 -07:00
Jeff Brown
41c076715d
Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev
2013-04-03 23:59:56 +00:00
Jeff Sharkey
5c1994eeff
am 04e740a6: am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
...
* commit '04e740a65e2399c4a4b211408bd84f2d545d9f4a':
Warn when exposing file:// Uris beyond a process.
2013-04-03 16:33:52 -07:00
Jeff Sharkey
04e740a65e
am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
...
* commit '0f8e8b03ebb35040c299079adc1c351f37ce4885':
Warn when exposing file:// Uris beyond a process.
2013-04-03 16:29:55 -07:00
Jeff Sharkey
0f8e8b03eb
Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
2013-04-03 23:28:07 +00:00
Matthew Xie
be96b634dd
am afa72ed8: am 599efc3a: Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev
...
* commit 'afa72ed8b8be8652303dedbf8f1c114ef9903071':
Fix minor LE descriptor permissions issue
2013-04-03 15:08:29 -07:00
kmccormick
b471da283e
am b85e328d: am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'b85e328d380f3cd992302d3d36fbdce454990e64':
Doc update: fix broken code sample
2013-04-03 15:03:53 -07:00
Matthew Xie
afa72ed8b8
am 599efc3a: Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev
...
* commit '599efc3aa34351e02bfa6e8b9e3fd530b8d9c632':
Fix minor LE descriptor permissions issue
2013-04-03 15:02:49 -07:00
Matthew Xie
599efc3aa3
Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev
2013-04-03 22:00:07 +00:00
Andre Eisenbach
6f0ed128e4
Fix minor LE descriptor permissions issue
...
Change-Id: Idded482a08f17a1373adf3e3a51709ff585d4f24
2013-04-03 14:54:12 -07:00
Jeff Brown
4d656885ed
Clear mCurSender when mCurChannel is modified.
...
This fixed an issue where an InputEventSender might outlive
its usefulness and continue to be used well after it should
have been disposed or recreated.
Also improves the queue management somewhat.
Bug: 8493879
Change-Id: I7e0b6a3c43cbe72f8762991f5d36560feebd214b
2013-04-03 14:40:57 -07:00
kmccormick
b85e328d38
am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'bbcf0852f786ea1c9cf6dca85f45487b7739bfab':
Doc update: fix broken code sample
2013-04-03 14:34:07 -07:00
kmccormick
bbcf0852f7
am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
Doc update: fix broken code sample
2013-04-03 14:30:09 -07:00
kmccormick
9d9365916d
am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
Doc update: fix broken code sample
2013-04-03 14:26:34 -07:00
kmccormick
f57266175d
am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '2144eee3576e3fb382170f502e41f1aae572559a':
Doc update: fix broken code sample
2013-04-03 14:23:54 -07:00
kmccormick
91e01a4d2e
Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
2013-04-03 21:16:08 +00:00
kmccormick
e4ce502d77
Doc update: fix broken code sample
...
"Bug: 8537853"
Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
2013-04-03 14:13:36 -07:00
Brian Carlstrom
96242a1b17
am 3c7df09d: am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
...
* commit '3c7df09d4dd00fb23da888726182f00788957cd9':
Adjust the HttpResponseCache for OkHttp.
2013-04-03 14:12:27 -07:00
Brian Carlstrom
3c7df09d4d
am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
...
* commit '6fdcb168a7a0a4f508063019ca4d2ec35458f892':
Adjust the HttpResponseCache for OkHttp.
2013-04-03 14:06:55 -07:00
Kenny Root
de1175db67
resolved conflicts for merge of 0afa8b36 to master
...
Change-Id: I09a453ab5dbad58e3dc0858972e222a34d53b282
2013-04-03 14:04:14 -07:00
Kenny Root
0afa8b3694
am 75827d4a: Merge "Add direct API to get ManifestDigest" into jb-mr2-dev
...
* commit '75827d4a3155c190f455329a67c84ac8fbb9bda0':
Add direct API to get ManifestDigest
2013-04-03 13:50:22 -07:00
Kenny Root
75827d4a31
Merge "Add direct API to get ManifestDigest" into jb-mr2-dev
2013-04-03 20:27:43 +00:00
jwilson
dea64ad715
Adjust the HttpResponseCache for OkHttp.
...
Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
2013-04-03 20:15:36 +00:00
Kenny Root
2aeb228989
am 6812059b: am d72317ab: Remove keystore entries when package removed
...
* commit '6812059b2d4aecb732ce3c94c58f2494ddc4ff6a':
Remove keystore entries when package removed
2013-04-03 12:40:37 -07:00
Kenny Root
6812059b2d
am d72317ab: Remove keystore entries when package removed
...
* commit 'd72317abd79ddf95d48c8f35bf1070900ff55b5e':
Remove keystore entries when package removed
2013-04-03 12:35:43 -07:00
Jeff Sharkey
a14acd20b8
Warn when exposing file:// Uris beyond a process.
...
Check for file:// Uris inside Intents, ClipData, Notifications and
RemoteViews when StrictMode option is enabled.
Also introduces Intent.prepareToLeaveProcess() to uniformly handle
Intents about to leave an app process.
Bug: 8529070
Change-Id: I8efb43877cbc5f21eb029fc6492b3ee1415059ef
2013-04-03 11:45:44 -07:00
Kenny Root
d72317abd7
Remove keystore entries when package removed
...
Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.
(cherry picked from commit 95e3ee3971
2013-04-03 11:32:52 -07:00
Scott Kennedy
7ee8002aab
resolved conflicts for merge of b5d6b3fe to master
...
Change-Id: Ib7beb5c22fadd7aae5039d49a819fbc91d355b6b
2013-04-03 11:15:50 -07:00
Scott Kennedy
b5d6b3fec0
am 688c3344: am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
...
* commit '688c33448572fa3879b1486d8fa1bf16cd946211':
docs: Typos and other fixes
2013-04-03 09:42:06 -07:00
Scott Kennedy
688c334485
am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
...
* commit '23eda7cd0a2b80bafcba7c24f49a73a2f11f782f':
docs: Typos and other fixes
2013-04-03 09:38:49 -07:00
Scott Kennedy
23eda7cd0a
am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
...
* commit '76f9a0a6800d8a8945156a95dea79f16ec704b3d':
docs: Typos and other fixes
2013-04-03 09:35:18 -07:00
Scott Kennedy
76f9a0a680
am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
...
* commit 'c318dbcf358772ab53b0380edb3e487a773ad2d8':
docs: Typos and other fixes
2013-04-03 09:31:32 -07:00
Scott Kennedy
555c82cd43
am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
...
* commit 'f7c06ddbfc79921d389ed6699df17e54c428571e':
docs: Typos and other fixes
2013-04-03 09:20:38 -07:00
Scott Kennedy
f7c06ddbfc
Merge "docs: Typos and other fixes" into jb-mr1-dev
2013-04-03 16:16:35 +00:00
Lorenzo Colitti
3131580086
am 92871140: am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev
...
* commit '92871140e2f667743212bdbe418aa833142b73bb':
Fix LinkProperties's equals() method.
2013-04-02 22:35:48 -07:00
Lorenzo Colitti
92871140e2
am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev
...
* commit '6c2e8fb4d530c5fb1352e8667449591b39d89c5a':
Fix LinkProperties's equals() method.
2013-04-02 22:32:34 -07:00
Lorenzo Colitti
6c2e8fb4d5
Merge "Fix LinkProperties's equals() method." into jb-mr2-dev
2013-04-03 05:28:52 +00:00
Jeff Brown
fc00755627
am 4c20e618: am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender.
...
* commit '4c20e61808a75f217e99b589261821ca453cea1b':
Fix reference cycle in InputEventReceiver and Sender.
2013-04-02 20:08:01 -07:00
