Bryce Lee
1b695edc97
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385
...
am: d980b8c7a0
* commit 'd980b8c7a05a2dc51145c3465c14f1f106a8bc47':
Remove duplicate Bluetooth profiles.
2015-12-18 23:13:51 +00:00
Bryce Lee
d980b8c7a0
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
...
am: 9c27969385
* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
Remove duplicate Bluetooth profiles.
2015-12-18 23:07:49 +00:00
Bryce Lee
9c27969385
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
2015-12-18 23:02:40 +00:00
Daniel Koulomzin
94794af6be
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02
...
am: 898e330aae
* commit '898e330aaedbfa9e41d649187800c307e3d84169':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
2015-12-18 20:09:35 +00:00
Daniel Koulomzin
898e330aae
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
...
am: cbef517d02
* commit 'cbef517d02f4f3680e155cc1a704ebf5c959d03f':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
2015-12-18 11:55:52 -08:00
Daniel Koulomzin
cbef517d02
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
2015-12-18 19:49:18 +00:00
Bryce Lee
15309a3d20
Remove duplicate Bluetooth profiles.
...
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
2015-12-18 11:34:20 -08:00
Daniel Koulomzin
087ae471c2
Making ViewRootImpl drop input events when the Activity is in ambient
...
mode.
WearableActivityController tells ViewRootImpl about ambient mode.
Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
2015-12-18 12:56:00 -05:00
Bryce Lee
132814f20d
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05
...
am: 9eaa59a1ff
* commit '9eaa59a1ff315bbf4d9809b30bf7777aa88e6bee':
Add setting for declaring disabled bluetooth profiles.
2015-12-17 19:51:17 +00:00
Bryce Lee
9eaa59a1ff
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
...
am: cf91b45c05
* commit 'cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
Add setting for declaring disabled bluetooth profiles.
2015-12-17 11:45:17 -08:00
Bryce Lee
cf91b45c05
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
2015-12-17 19:40:47 +00:00
Bryce Lee
0ccc3a1cb5
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b
...
am: fc3762aafd
* commit 'fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:20:34 +00:00
Bryce Lee
fc3762aafd
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
...
am: cae2f2415b
* commit 'cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:09:56 +00:00
Bryce Lee
e457fa4b9d
Add UUID to BluetoothHeadsetClientCall
...
This will allow for unique identification of a call as id only provides
uniqueness per session.
Bug: 26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
2015-12-16 15:33:59 -08:00
Bryce Lee
ec85f34812
Add setting for declaring disabled bluetooth profiles.
...
Bug: 25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
2015-12-16 13:32:28 -08:00
Ian Pedowitz
911dfe8861
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
...
am: cf07154e71
* commit 'cf07154e7102de304f1d887c8c2a2ef61b4880d7':
DO NOT MERGE Remove more extras during notification lightening.
2015-12-11 17:12:35 -08:00
Dan Sandler
ddb52fb1f5
DO NOT MERGE Remove more extras during notification lightening.
...
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.
Cherry-picked from 5012853de2
Bug: 26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
2015-12-12 01:05:25 +00:00
Bryce Lee
a83d518689
Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a
...
am: 180dd72a9b
* commit '180dd72a9b36ca6f74e5ad255347d815a0c8729a':
Improve logging in BluetoothHeadsetClientCall.
2015-12-09 15:01:13 -08:00
Bryce Lee
3c67873f0a
Improve logging in BluetoothHeadsetClientCall.
...
Bug: 26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
2015-12-08 11:22:31 -08:00
Prashant Malani
3ebd5ceb90
Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15
...
am: 6344cb8144
* commit '6344cb8144647e4e49bc69cbf34a084ca7712115':
Add rotary encoder input source
2015-12-08 01:37:05 +00:00
Prashant Malani
487f0d3d15
Merge "Add rotary encoder input source" into cw-e-dev
2015-12-08 01:27:18 +00:00
Eino-Ville Talvala
5794dbb1a5
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6
...
am: e2d516fd4b
* commit 'e2d516fd4b77352919d1c40971678909e3f4a15d':
Camera: codegen doc update
2015-12-05 00:28:38 +00:00
Eino-Ville Talvala
7417f70ac6
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d
...
am: add4b91d41
* commit 'add4b91d41d3ba810b6b25c14d7c13050394f201':
Camera: codegen doc update
2015-12-05 00:11:43 +00:00
Eino-Ville Talvala
add4b91d41
Merge "Camera: codegen doc update" into mnc-dev
...
am: 69c5e7143d
* commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
Camera: codegen doc update
2015-12-04 16:03:23 -08:00
Christine Hallstrom
9355a0420e
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am: 7fb263c472
...
am: 67d068b5ec
* commit '67d068b5ec7ca3739047f0c5a162f9317171f784':
Log API calls to createBond(), cancelBondProcess(), removeBond()
2015-12-03 20:42:35 +00:00
Christine Hallstrom
044b8f3f03
Log API calls to createBond(), cancelBondProcess(), removeBond()
...
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.
Bug: 25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
2015-12-03 19:08:17 +00:00
Ben Fennema
e9970bc981
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
...
This reverts commit ad75169628 .
Change-Id: Ic2f003fc200c077391d18bef9d5b79a98601769c
2015-12-02 01:05:25 +00:00
Jani Suonpera
ad75169628
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
...
This is special solution only for emerald branch.
Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.
Change-Id: Id19226d7d3ac0628488a0f005f2b1c44bafcf9b6
Signed-off-by: Ben Fennema <fennema@google.com >
2015-11-30 21:24:48 -08:00
Yin-Chia Yeh
5fdf0a1af0
Camera: codegen doc update
...
Bug: 25427163
Change-Id: I9e552a7ad365f2a45e5ebb74234b9dfb8eb1225c
2015-11-30 14:25:37 -08:00
Bryce Lee
52d93db91d
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3
...
am: e2861471b9
* commit 'e2861471b906d94b1211beeee824ae43b7e931c3':
Add Bluetooth headset API to allow disabling audio route.
2015-11-17 16:28:47 +00:00
Bryce Lee
cb8749c903
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
2015-11-17 16:08:44 +00:00
Badhri Jagan Sridharan
4f72447fbf
BatteryService: Add Max charging voltage
...
Bug: 25229483
Change-Id: Ibeba97eb145c3d59a763bd8632ab7fcc43118e4b
(cherry picked from commit f92fcfe36a )
2015-11-16 10:43:52 -08:00
Bryce Lee
0db53d90a0
Add Bluetooth headset API to allow disabling audio route.
...
This functionality is required by devices which have multiple profiles
using the SCO channel. For example, a device that is both a HFP AG and HF.
In this case, we must explicitly notify the profiles when they can acquire
the channel as they are not aware of each other. A similar change was
previously added to the Bluetooth Headset Client profile.
Bug: 25485578
Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
2015-11-16 08:55:52 -08:00
Matthew Williams
af5c9f809c
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74
...
am: c455148edc
* commit 'c455148edce05b4862df8853a78276fb5f28151a':
Sync extras bundle comparison can throw NPE
2015-11-13 02:09:35 +00:00
Matthew Williams
c455148edc
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
...
am: 6d13650c74
* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
Sync extras bundle comparison can throw NPE
2015-11-13 02:03:01 +00:00
Matthew Williams
6d13650c74
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2
...
am: a0d20db02f
* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
Sync extras bundle comparison can throw NPE
2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f
Sync extras bundle comparison can throw NPE am: c0f39c1ece
...
am: 34b700a7c2
* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
Sync extras bundle comparison can throw NPE
2015-11-13 01:50:11 +00:00
Matthew Williams
34b700a7c2
Sync extras bundle comparison can throw NPE
...
am: c0f39c1ece
* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
Sync extras bundle comparison can throw NPE
2015-11-13 01:41:59 +00:00
Eino-Ville Talvala
0e57a4d021
Camera: Documentation updates am: d8407271ff
...
am: 37e78cf8f1
* commit '37e78cf8f18523cda95926a85ae2b3678ffd7e5e':
Camera: Documentation updates
2015-11-12 01:18:12 +00:00
Eino-Ville Talvala
37e78cf8f1
Camera: Documentation updates
...
am: d8407271ff
* commit 'd8407271ffa83d27e9a524f485a0799e422e1fd6':
Camera: Documentation updates
2015-11-12 01:10:07 +00:00
Eino-Ville Talvala
d8407271ff
Camera: Documentation updates
...
- Clarify hardware.camera feature being only for the back camera
- Clarify what setting a CaptureRequest field to null does
- Use preCorrectionActiveArray instead of activeArray in list of
possible raw output sizes
- Clarify length of GPS processing field for camera1 API
Bug: 24540625
Bug: 23908116
Bug: 23051627
Bug: 17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
2015-11-11 23:59:38 +00:00
Daniel Koulomzin
71c012e001
ActivityView gets its own thread pool.
...
Bug: 24316798
Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
2015-11-11 18:21:57 -05:00
Matthew Williams
c0f39c1ece
Sync extras bundle comparison can throw NPE
...
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033 )
2015-11-11 14:34:04 +00:00
Riley Andrews
2c740f1dcf
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
...
am: c8bb39d98d
* commit 'c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
Convert ashmem bitmap thresholds to constants.
2015-11-04 20:24:36 +00:00
Riley Andrews
0394a0c399
Convert ashmem bitmap thresholds to constants.
...
Bug 25256717
Change-Id: I23e2795ef8798d83bf60dcbd6ff2e7093fcaa9b0
Signed-off-by: Riley Andrews <riandrews@google.com >
2015-11-03 23:52:17 -08:00
Ian Pedowitz
95fc53b029
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
...
am: 966d6040c6
* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 22:05:23 +00:00
Ian Pedowitz
966d6040c6
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
2015-11-03 21:58:30 +00:00
Dianne Hackborn
9a13cc6992
Merge "Fix issue #25357209 : Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
...
am: 71e4984505
* commit '71e49845054a3a7dacc51efc4fe658818caec048':
Fix issue #25357209 : Could not send SMS or MMS messages, had to reboot
2015-11-03 18:27:18 +00:00
Riley Andrews
8cee7c1711
Limit persistent ashmem backed fds to a minimum of 128kB.
...
Bug 25256717
Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com >
2015-11-03 17:46:15 +00:00
Dianne Hackborn
fcc95a6d2c
Fix issue #25357209 : Could not send SMS or MMS messages, had to reboot
...
I think what probably happened is that since we only report an app
going in to the "interaction" state as an interaction event to usage
stats, apps that sit around in that state forever will only see one
interaction at the start and never again. So usage stats could start
thinking they are idle.
Fix this by having the activity manager report an interaction event
for such long running applications at least once a day.
Also, because it is correct and for paranoia by protected us another
way, system uids should never go in to standby.
Change-Id: I8a3805bfca86cbe78560488a649ecd07427da99a
2015-11-02 16:15:35 -08:00