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
6344cb8144
Merge "Add rotary encoder input source" into cw-e-dev
...
am: 487f0d3d15
* commit '487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
Add rotary encoder input source
2015-12-08 01:31:31 +00:00
Prashant Malani
487f0d3d15
Merge "Add rotary encoder input source" into cw-e-dev
2015-12-08 01:27:18 +00:00
Amit Mahajan
d515b124f7
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
...
am: cd2cc9aa9b
* commit 'cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
2015-12-07 23:10:55 +00:00
Amit Mahajan
cd2cc9aa9b
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
2015-12-07 18:15:38 +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
e2d516fd4b
Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41
...
am: 7417f70ac6
* commit '7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
Camera: codegen doc update
2015-12-04 16:20:47 -08: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
67d068b5ec
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
...
am: 7fb263c472
* commit '7fb263c472c9df98410b2b9dfe72e093e2d594e0':
Log API calls to createBond(), cancelBondProcess(), removeBond()
2015-12-03 20:35:39 +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
Adam Lesinski
6902052c77
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
...
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
2015-11-20 10:58:02 -08:00
Amit Mahajan
8ed715e31e
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
...
Bug: 23067429
Change-Id: Ia66fd1a6ff248520e86f6e502767b22c4d9d4814
2015-11-18 19:56:47 +00: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
Todd Kennedy
3b91bd2173
resolved conflicts for 7de7e0b0 to stage-aosp-master
...
(cherry picked from commit 9f86026444 )
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-11-16 10:43:53 -08: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
Jeff Sharkey
637d05eb5c
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
...
am: a975732a83
* commit 'a975732a8302893a40cdc444f893bf09b7669173':
Handle "uninstalled" apps when pruning app-ops.
2015-10-30 21:37:17 +00:00
Anthony Hugh
3a9bf5c8ce
Merge "Add intent extra for determining if apps are system apps" into cw-e-dev
2015-10-30 20:04:10 +00:00
Jeff Sharkey
e2ed23e6b2
Handle "uninstalled" apps when pruning app-ops.
...
During system boot, we prune app-ops belonging to apps that have
been uninstalled. However, apps installed on adopted storage devices
haven't been scanned at this point, so they appear to be uninstalled.
To avoid pruning app-ops for these apps, we need a getPackageUid()
variant that also considers "uninstalled" apps for which we still
have PackageSetting values.
Bug: 25206071
Change-Id: I1820f674d45c5ddc1c5f10ed7d859e7025005e28
2015-10-29 19:04:15 -07:00
Bryce Lee
dc13382622
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
...
Bug: 25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
2015-10-28 22:21:54 -07:00
Anthony Hugh
3575a40009
Add intent extra for determining if apps are system apps
...
This is being added to help identify system apps so that
the UI can filter on that type.
BUG: 24955055
Change-Id: Ie4be3717ce997f60eeb48a389c0f54ce5803141a
2015-10-26 17:47:05 -07:00
Adrian Roos
a53bbb652b
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
...
am: 93a6b4c129
* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:29:13 +00:00
Adrian Roos
0450565d9a
Revert "Revert "Track ashmem memory usage in Parcel""
...
This reverts commit e2adb2cf0f .
Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:49:38 -07:00
Ian Pedowitz
b402735fc0
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
...
am: 09fd4ecf90
* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:32:37 +00:00
Ian Pedowitz
09fd4ecf90
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
2015-10-22 22:26:32 +00:00
Ian Pedowitz
e2adb2cf0f
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit ab3f972403 .
Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
2015-10-22 22:09:04 +00:00
Yoshiki Iguchi
6649ee972b
Fix crash on calling removeSelection with showing selection handlers
...
am: 9582e15196
* commit '9582e151964be60457d4abd712857fb1e8a4586d':
Fix crash on calling removeSelection with showing selection handlers
2015-10-22 07:39:17 +00:00