Dan Sandler
d65a7d7797
am 2200f888: Merge "Adjust iconography in notification guts." into lmp-dev
...
* commit '2200f888b808d5ab5867a9a7c7edb43d097481f6':
Adjust iconography in notification guts.
2014-09-03 22:23:11 +00:00
Dan Sandler
6704cb980b
Merge "Adjust iconography in notification guts." into lmp-dev
2014-09-03 22:14:32 +00:00
Ricardo Cervera
e8e73ea1d6
am ce97069f: am 2ad54d53: am a32f29e2: am a4fe79a4: docs: Adding Sony logo to wear page
...
* commit 'ce97069ff4454484b54d04da4b2afcfbfeffc623':
docs: Adding Sony logo to wear page
2014-09-03 22:08:52 +00:00
Ricardo Cervera
926b6a71b1
am 7f54a8c7: am ce04c532: am 734ef513: am 2d80f931: docs: Adding Sony logo to Wear partners
...
* commit '7f54a8c76bb3676f30f30d7a58c7b388c4a486a6':
docs: Adding Sony logo to Wear partners
2014-09-03 22:08:47 +00:00
Ricardo Cervera
29bd102bde
am 2ad54d53: am a32f29e2: am a4fe79a4: docs: Adding Sony logo to wear page
...
* commit '2ad54d53ccea8e17cdeabc71e37f73ad0e1982da':
docs: Adding Sony logo to wear page
2014-09-03 21:58:00 +00:00
Ricardo Cervera
850da47a9f
am ce04c532: am 734ef513: am 2d80f931: docs: Adding Sony logo to Wear partners
...
* commit 'ce04c532ca6134463011fd7f66468363375eb4c4':
docs: Adding Sony logo to Wear partners
2014-09-03 21:57:48 +00:00
Svetoslav
a1b3bb9f73
am 87263510: Merge "Unregister from the remote renderer only if bound." into lmp-dev
...
* commit '87263510e60bb163dc85152405217538797646e8':
Unregister from the remote renderer only if bound.
2014-09-03 21:50:54 +00:00
Jean-Michel Trivi
88bf8271e9
am be165659: am f557832a: (-s ours) am 1c9d1485: am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver
...
* commit 'be1656598315f3207a904c04dbd886b9892277d6':
Do not persist and restore the media button event receiver
2014-09-03 21:50:48 +00:00
Ricardo Cervera
2ad54d53cc
am a32f29e2: am a4fe79a4: docs: Adding Sony logo to wear page
...
* commit 'a32f29e225e989fad682df91cb0a1cd36e7b7279':
docs: Adding Sony logo to wear page
2014-09-03 21:45:54 +00:00
Ricardo Cervera
ce04c532ca
am 734ef513: am 2d80f931: docs: Adding Sony logo to Wear partners
...
* commit '734ef51380a4f6fce0a633f56f9db5b6eef5be71':
docs: Adding Sony logo to Wear partners
2014-09-03 21:45:49 +00:00
Svetoslav
840bb00855
Merge "Unregister from the remote renderer only if bound." into lmp-dev
2014-09-03 21:43:13 +00:00
Jean-Michel Trivi
46566ebbf5
am f557832a: (-s ours) am 1c9d1485: am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver
...
* commit 'f557832ad82041b17a15448e3b776fdef4ba747b':
Do not persist and restore the media button event receiver
2014-09-03 21:41:49 +00:00
Christopher Tate
047e6157e9
am 3e0c16fe: Merge "The transport system API needs to manage binder identity" into lmp-dev
...
* commit '3e0c16fe5eef7b485f3735f3026a7686fe68a027':
The transport system API needs to manage binder identity
2014-09-03 21:39:37 +00:00
Svetoslav
9e45df1077
am c23f9664: Merge "NumberPicker not announcing current selection." into lmp-dev
...
* commit 'c23f96644107137d8e6fd48d44b910a3cca3c078':
NumberPicker not announcing current selection.
2014-09-03 21:39:32 +00:00
Ricardo Cervera
a32f29e225
am a4fe79a4: docs: Adding Sony logo to wear page
...
* commit 'a4fe79a4c4e36770c95f8450b664d7a1fa111004':
docs: Adding Sony logo to wear page
2014-09-03 21:34:17 +00:00
Ricardo Cervera
734ef51380
am 2d80f931: docs: Adding Sony logo to Wear partners
...
* commit '2d80f9317fe69b932d5d9aeb9fc14017fab1af9c':
docs: Adding Sony logo to Wear partners
2014-09-03 21:34:13 +00:00
Svetoslav
9e795e19c7
Unregister from the remote renderer only if bound.
...
bug:8213791
Change-Id: Ia9efa33331437c4db447acf0c510d4cb4932a593
2014-09-03 14:34:01 -07:00
Christopher Tate
835b313fa8
Merge "The transport system API needs to manage binder identity" into lmp-dev
2014-09-03 21:33:03 +00:00
Svetoslav
058e1f5a38
Merge "NumberPicker not announcing current selection." into lmp-dev
2014-09-03 21:29:16 +00:00
Ricardo Cervera
a4fe79a4c4
docs: Adding Sony logo to wear page
...
Change-Id: I5e56ca313364d832bb26f7b07891381a0c2b55df
2014-09-03 14:27:50 -07:00
Jean-Michel Trivi
f557832ad8
am 1c9d1485: am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver
...
* commit '1c9d1485f381d610152abd64bfaa6d5d963878d2':
Do not persist and restore the media button event receiver
2014-09-03 21:23:49 +00:00
Ricardo Cervera
2d80f9317f
docs: Adding Sony logo to Wear partners
...
Change-Id: I3c4b52d647f0a942ef5d5daad6fb6d5197839f2d
2014-09-03 14:17:06 -07:00
Christopher Tate
539b217b76
The transport system API needs to manage binder identity
...
...around writing settings. It does its own proper permission check;
it just needs to make sure not to accidentally crash the caller in
strange and wondrous ways because of failing to clear binder identity
before writing the result to secure settings.
Bug 16542048
Change-Id: I88d1f2dbeebd24eed5d86989f0ca0d834878b054
2014-09-03 14:12:11 -07:00
Jean-Michel Trivi
1c9d1485f3
am 6d4873f5: am 0511ba50: Do not persist and restore the media button event receiver
...
* commit '6d4873f577774e5e7427e2675e4c6ff8049646be':
Do not persist and restore the media button event receiver
2014-09-03 21:11:13 +00:00
Eino-Ville Talvala
207b43c751
am 25c35986: Merge "JobScheduler: Fix doc build break" into lmp-dev
...
* commit '25c3598620c9e1a2c8ab3aea766e9da31bc2c5be':
JobScheduler: Fix doc build break
2014-09-03 21:00:51 +00:00
Nancy Chen
84f403825c
am d93b5e24: Merge "Update api for onConnectionAdded/Removed" into lmp-dev
...
* commit 'd93b5e24595d50c70d94217c871aca60bd9cabed':
Update api for onConnectionAdded/Removed
2014-09-03 21:00:46 +00:00
Jean-Michel Trivi
6d4873f577
am 0511ba50: Do not persist and restore the media button event receiver
...
* commit '0511ba506d30d0a517491a92eda8d001a441d557':
Do not persist and restore the media button event receiver
2014-09-03 20:59:53 +00:00
Eino-Ville Talvala
b10e39e716
Merge "JobScheduler: Fix doc build break" into lmp-dev
2014-09-03 20:53:34 +00:00
Marco Fucci
0dd873dbef
am dc6323ce: Merge "Disconnect TrustAgent when not active." into lmp-dev
...
* commit 'dc6323ceddffdc552fba76b7512687291d9ca8db':
Disconnect TrustAgent when not active.
2014-09-03 20:51:25 +00:00
Eino-Ville Talvala
93b47603bf
JobScheduler: Fix doc build break
...
Change-Id: I769da7274fe5e3f64a47c82f893afeee6a11254e
2014-09-03 20:51:13 +00:00
Nancy Chen
0c76727916
Merge "Update api for onConnectionAdded/Removed" into lmp-dev
2014-09-03 20:51:12 +00:00
Marco Fucci
8364885a7d
Merge "Disconnect TrustAgent when not active." into lmp-dev
2014-09-03 20:39:05 +00:00
Nancy Chen
b5acab4639
Update api for onConnectionAdded/Removed
...
Removed methods from public API for previous change.
Bug: 17262026
Change-Id: Ic41eccf8b9c1489b6261758640a35664b39ea819
2014-09-03 13:33:46 -07:00
Amith Yamasani
f0ccb153b3
am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev
...
* commit 'f27739f78aa38da5e3a29e2a1e03c21b6f95f5ee':
Add some @SystemApi tags for internal user-related APIs
2014-09-03 20:32:57 +00:00
Julian Odell
2c9e137fab
am 45ae7fb1: Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev
...
* commit '45ae7fb1d9981f9b17871c30e210db2a10d19075':
Bug 17262099: MMS API changes (multi-project).
2014-09-03 20:27:08 +00:00
Svetoslav
ca50566101
NumberPicker not announcing current selection.
...
bug:17299486
Change-Id: I73fd33ef3518ef8e6cdd40cd036e8f104dc492b6
2014-09-03 13:26:34 -07:00
Amith Yamasani
bef1036af7
Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev
2014-09-03 20:26:10 +00:00
Julian Odell
6c25708eb5
Merge "Bug 17262099: MMS API changes (multi-project)." into lmp-dev
2014-09-03 20:20:34 +00:00
Amith Yamasani
0e8d7d63ba
Add some @SystemApi tags for internal user-related APIs
...
Also added an internal isManagedProfile()
Bug: 17371392
Change-Id: Ibcc26771d954505cbd530192bf4a8a25a8d4cae0
2014-09-03 13:17:28 -07:00
Evan Charlton
147fb18db7
am adb87527: Merge "Remove startActivityFromInCall API" into lmp-dev
...
* commit 'adb8752767b5ac1a35b0d239e550c6b39b81f771':
Remove startActivityFromInCall API
2014-09-03 20:16:51 +00:00
Julian Odell
31ef14d4f0
Bug 17262099: MMS API changes (multi-project).
...
Move MMS api to using content provider rather than byte[] to pass MMS message contents.
Rebased and merged into TOT.
Change-Id: I3509b2774b1cb30a1c8100bb25d283140c963b6b
2014-09-03 13:11:56 -07:00
Brian Carlstrom
2803b6854b
am c74dc4b7: Merge "Restrict lazy dexopt to eng builds only" into lmp-dev
...
* commit 'c74dc4b73b59f41b25e78a4f7970546dfa3c25dc':
Restrict lazy dexopt to eng builds only
2014-09-03 20:09:00 +00:00
Evan Charlton
4d12a03771
Merge "Remove startActivityFromInCall API" into lmp-dev
2014-09-03 20:07:47 +00:00
Brian Carlstrom
e7a2138635
Merge "Restrict lazy dexopt to eng builds only" into lmp-dev
2014-09-03 20:02:42 +00:00
Wink Saville
d8ca408420
am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev
...
* commit '3c95cae1ab33a0fd3bd93422e91a8182bf49d017':
Rename getActivatedXxx to getActiveXxx
2014-09-03 19:57:53 +00:00
Wink Saville
baaa4ef6f0
Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev
2014-09-03 19:50:55 +00:00
Matthew Xie
46247d56df
am 0465993a: Merge "Close the base socket when bindListen fails" into lmp-dev
...
* commit '0465993a8c0ddec88311db561b1220786150344a':
Close the base socket when bindListen fails
2014-09-03 19:36:10 +00:00
Matthew Xie
ddfa8e18fd
Merge "Close the base socket when bindListen fails" into lmp-dev
2014-09-03 19:29:03 +00:00
Matthew Xie
726652e9d3
Close the base socket when bindListen fails
...
Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2
2014-09-03 19:25:39 +00:00
Paul Jensen
00f0ced3d2
am bacfc3d4: Merge "Use alarm rather than delayed message to end lingering." into lmp-dev
...
* commit 'bacfc3d4d9cb50d08035b54529612806e4bd055e':
Use alarm rather than delayed message to end lingering.
2014-09-03 19:24:33 +00:00