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
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
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
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
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
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
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
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
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
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
4c20e61808
am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender.
...
* commit 'a4ca8ea0ad14c509d1ced46482e83c1b8a518982':
Fix reference cycle in InputEventReceiver and Sender.
2013-04-02 20:05:03 -07:00
Jeff Brown
a4ca8ea0ad
Fix reference cycle in InputEventReceiver and Sender.
...
If the receiver or sender was not properly disposed, then
the underlying input channel might be leaked because the
native peer was holding a strong reference to the object.
Switched to using a weak reference.
Also updated Binder to use a new helper created for this purpose.
Change-Id: I19680bf96d0548777bff02aa1d91874d1e8e41da
2013-04-02 18:59:15 -07:00
Justin Koh
9d4ed1ec62
am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev
...
* commit 'ddd168d65f0bc9644434d18dd82fe6c994670dba':
Add global key configuration file
2013-04-02 18:17:01 -07:00
Justin Koh
d378ad74c6
Add global key configuration file
...
Add global key configuration file. A global key is one that is handled by
PhoneWindowManager before dispatching and sent to a given component via
broadcast instead of going to the foreground app.
Bug: 8510681
Change-Id: Ic6a8e559680d005613ed22874b27eb78bbfc4499
2013-04-02 18:09:27 -07:00
Kenny Root
6c918cec31
Add direct API to get ManifestDigest
...
This makes it faster for applications that don't want to collect all the
certificates but do want the AndroidManifest.xml digest.
Bug: 8528639
Change-Id: Ide9498d0981188960af194a9568387337c075bcc
2013-04-02 14:22:03 -07:00
Brian Colonna
5856ee4bd6
am 1eccc0cf: Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev
...
* commit '1eccc0cf5f7f33203091c0b475a4ad91570c85cd':
FUL now restarts when flipping tablet 180 (bug 7484464)
2013-04-02 13:26:23 -07:00
Brian Colonna
1eccc0cf5f
Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev
2013-04-02 20:19:24 +00:00
Elliott Hughes
1113956349
am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev
...
* commit 'dbca824dc00209c603a956f45bb684e57ee3e478':
Add DateFormat.getBestDateTimePattern.
2013-04-02 12:21:48 -07:00
Elliott Hughes
dbca824dc0
Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev
2013-04-02 19:16:17 +00:00
Elliott Hughes
031b581af2
Add DateFormat.getBestDateTimePattern.
...
Bug: 8283323
Change-Id: Id8d94456b93555d799229b7dd88fcbcf5c6bf7ff
2013-04-02 12:00:47 -07:00
Kenny Root
95e3ee3971
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.
Bug: 3020069
Change-Id: Id4b1d51a5fa4c418865055635a84bebcf5b65ec8
2013-04-02 11:50:16 -07:00
Chet Haase
7aab113423
am c99d3c1f: Stop jank from window animations overlapping activity animations
...
* commit 'c99d3c1fd618c1f64103b4f39dd95330309be5a3':
Stop jank from window animations overlapping activity animations
2013-04-02 08:24:48 -07:00
