OSDN Git Service
Julius D'souza [Wed, 4 Jan 2017 23:11:46 +0000 (23:11 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854
am:
da8462aa5b
Change-Id: I537e98e43c61868d156439383ee21a06b3dc2b41
Julius D'souza [Wed, 4 Jan 2017 23:10:46 +0000 (23:10 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23
am:
8366e50043
Change-Id: I40341da2fe7c3e8e5129e647666eaf1860a2e522
Julius D'souza [Wed, 4 Jan 2017 23:05:45 +0000 (23:05 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
am:
b60eb1a854
Change-Id: I86ef53eec2bbeff07c52e079e925719c3923941c
Julius D'souza [Wed, 4 Jan 2017 23:05:41 +0000 (23:05 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
am:
bbfdf7ad23
Change-Id: Ic6b72d6b72df516d4cec3b7a38e12366f7e334a1
Jeremy Joslin [Wed, 4 Jan 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6 am:
01828eb244
am:
b68823cab8
Change-Id: I19f5c7179a489e992356f141314582abc803ad2e
Julius D'souza [Wed, 4 Jan 2017 22:59:57 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
Jeremy Joslin [Wed, 4 Jan 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6
am:
01828eb244
Change-Id: I094906527e9baf20f6bcb844f261d0fdcb8f6aa6
Jeremy Joslin [Wed, 4 Jan 2017 22:53:12 +0000 (22:53 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
am:
5b4aec1dc6
Change-Id: Ic80d796221d94a092ed210dde3d1e3886d950265
Treehugger Robot [Wed, 4 Jan 2017 22:43:34 +0000 (22:43 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
Jeremy Joslin [Wed, 4 Jan 2017 21:52:11 +0000 (21:52 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c am:
acbf592683
am:
cb3f75cca7
Change-Id: I0da58029bb854a7df7bc286a0bd6a22c61d5daee
Jeremy Joslin [Wed, 4 Jan 2017 21:47:42 +0000 (21:47 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c
am:
acbf592683
Change-Id: Ic488962a47eecea4c2ed522596549ef088bfbfc3
Jeremy Joslin [Wed, 4 Jan 2017 21:42:41 +0000 (21:42 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
am:
34d46ca94c
Change-Id: I1e6f1751cf3ce690e09e8681c86f744a38c550d6
Treehugger Robot [Wed, 4 Jan 2017 21:35:03 +0000 (21:35 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
Jeremy Joslin [Thu, 29 Dec 2016 23:00:23 +0000 (15:00 -0800)]
Fix NetworkScoreServiceTest.testSystemRunning.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33905890
Change-Id: Icc1db79cde26f1445ca925780ff760b7aa0515b1
Merged-In: Idc92fe3669b0efdb20d3899ce4ce7bae70033aff
Joe LaPenna [Wed, 4 Jan 2017 19:58:56 +0000 (19:58 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi." am:
944b017031 am:
1c4cfe1af9
am:
303b853671
Change-Id: Ic35415f7d7b721faf09f9968cb2fd8e9ba6749b0
Joe LaPenna [Wed, 4 Jan 2017 19:54:32 +0000 (19:54 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi." am:
944b017031
am:
1c4cfe1af9
Change-Id: I094905e8fa7f54f4f5f0be80fa833ca44654f334
Joe LaPenna [Wed, 4 Jan 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi."
am:
944b017031
Change-Id: If63881b8b33ced7950ebb7e83fb8994e454b8642
Jeremy Joslin [Thu, 29 Dec 2016 18:18:48 +0000 (10:18 -0800)]
Use the new BIND_NETWORK_RECOMMENDATION_SERVICE.
Declare that the system uses the new
BIND_NETWORK_RECOMMENDATION_SERVICE permission.
Test: Built & ran
BUG:
33897544
Change-Id: I43424642a631f58da3a065f8221e351180f4f221
Merged-In: I41c7550adf0d1f81ed9a12068ba569e6a57f3b42
Treehugger Robot [Wed, 4 Jan 2017 19:42:16 +0000 (19:42 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi."
Marie Janssen [Wed, 4 Jan 2017 19:23:24 +0000 (19:23 +0000)]
Merge "Bluetooth: don't output dumpsys info twice" am:
c77074300b am:
fde6c2a4af
am:
fd853576c5
Change-Id: Ibd7eb23ffd10afc749dceb977683c02a5b5344fc
Marie Janssen [Wed, 4 Jan 2017 19:18:31 +0000 (19:18 +0000)]
Merge "Bluetooth: don't output dumpsys info twice" am:
c77074300b
am:
fde6c2a4af
Change-Id: I53c6c777cac8eb129ba1a4a08e81a496deb31c44
Marie Janssen [Wed, 4 Jan 2017 19:13:57 +0000 (19:13 +0000)]
Merge "Bluetooth: don't output dumpsys info twice"
am:
c77074300b
Change-Id: I727ed233944a18565e7286bfe0a8d7832a2be962
Marie Janssen [Wed, 4 Jan 2017 19:07:18 +0000 (19:07 +0000)]
Merge "Bluetooth: don't output dumpsys info twice"
Marie Janssen [Tue, 3 Jan 2017 19:37:38 +0000 (11:37 -0800)]
Bluetooth: don't output dumpsys info twice
Dumpsys info was printed in the "Application Services" section as well
as the bluetooth_manager section. Add an argument to print so it prints
from here, and doesn't in the other section.
Test: run a bugreport, check in "APP SERVICES" section
Bug:
29356402
Change-Id: I8adedaeac54c9a538c581459654dbdf96361e046
Makoto Onuki [Wed, 4 Jan 2017 19:00:06 +0000 (19:00 +0000)]
Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
am:
2258e5fdb9
Change-Id: Ieb15cc47f1db3ff805a91615d64bbe2c23d914ea
Makoto Onuki [Wed, 4 Jan 2017 18:59:55 +0000 (18:59 +0000)]
Get account features before taking lock (cherry-pick from master)
am:
fd24353d75
Change-Id: I4d89f492d4186f14516f93be800a6548127be921
TreeHugger Robot [Wed, 4 Jan 2017 18:54:05 +0000 (18:54 +0000)]
Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
Joe LaPenna [Wed, 4 Jan 2017 08:44:22 +0000 (00:44 -0800)]
Expose RecommendationRequest.Builder as SystemApi.
In order to test our recommender, we need to be able to create
network recommendation requests.
Test: make update-api
Change-Id: I68df0d3e684bcdb90709a34478d2aa669ee23547
Merged-In: I68df0d3e684bcdb90709a34478d2aa669ee23547
qinzhichao [Wed, 4 Jan 2017 17:37:17 +0000 (17:37 +0000)]
Merge "Fix NullPointerException in MediaPlayer" am:
c7c899bbe2 am:
15c9c1f8d1
am:
80713e98f7
Change-Id: Idbc93cea10adc0077341015ecd479baa76ae2c76
qinzhichao [Wed, 4 Jan 2017 17:32:20 +0000 (17:32 +0000)]
Merge "Fix NullPointerException in MediaPlayer" am:
c7c899bbe2
am:
15c9c1f8d1
Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
qinzhichao [Wed, 4 Jan 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Fix NullPointerException in MediaPlayer"
am:
c7c899bbe2
Change-Id: Iff261e6bd78c4f757ee0f7ae199710c9f92f0778
Treehugger Robot [Wed, 4 Jan 2017 17:23:06 +0000 (17:23 +0000)]
Merge "Fix NullPointerException in MediaPlayer"
Makoto Onuki [Thu, 15 Dec 2016 22:26:55 +0000 (14:26 -0800)]
Get account features before taking lock (cherry-pick from master)
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest
* without having Id49f2bd5dfa80ecf35b3a23c789100ade38c2656 *
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug:
33481725
Change-Id: Ie2fe9aea87d1a7167581f4cd74ae063ef24a4567
Merged-in: I1e4dd9701a76ca366f86fdaf2fc6c282e9dbe5c1
Jeremy Joslin [Wed, 4 Jan 2017 15:38:43 +0000 (15:38 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am:
871beedc6d am:
a169fc3494
am:
8be80273b8
Change-Id: I4930b2d6145e5d7f4e08d267629f40517cbeae34
Jeremy Joslin [Wed, 4 Jan 2017 15:34:16 +0000 (15:34 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am:
871beedc6d
am:
a169fc3494
Change-Id: I25f816c0ee3df784a02be58a042c505f2c839394
Jeremy Joslin [Wed, 4 Jan 2017 15:29:57 +0000 (15:29 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
am:
871beedc6d
Change-Id: I2554ede84b313e66af57e05c59046747c16ec23e
Treehugger Robot [Wed, 4 Jan 2017 15:24:30 +0000 (15:24 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
Neil Fuller [Wed, 4 Jan 2017 12:45:11 +0000 (12:45 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am:
75ba827a4e am:
6a29676687
am:
df49ab5576
Change-Id: I6aac69506e00ec9f0fdb431191a94b7b9b9fc0df
Neil Fuller [Wed, 4 Jan 2017 12:38:50 +0000 (12:38 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am:
75ba827a4e
am:
6a29676687
Change-Id: Icb55f2b160f6bd2f6c12845613ea3b4ea834693d
Neil Fuller [Wed, 4 Jan 2017 12:32:29 +0000 (12:32 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
am:
75ba827a4e
Change-Id: I08b809241b6e025c9a30377c09f616be3484d7af
Treehugger Robot [Wed, 4 Jan 2017 12:26:48 +0000 (12:26 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
Ivan Podogov [Wed, 4 Jan 2017 10:45:33 +0000 (10:45 +0000)]
Merge "HID Device role API fixes" am:
f33a71d017 am:
a7d58fecc6
am:
8e2e2b1381
Change-Id: I9e35c73f1a6094ddae892758d81955490aaa5f92
Ivan Podogov [Wed, 4 Jan 2017 10:41:26 +0000 (10:41 +0000)]
Merge "HID Device role API fixes" am:
f33a71d017
am:
a7d58fecc6
Change-Id: Iab0dc91a8e2d4066d5eb85ec4771d42642783671
Ivan Podogov [Wed, 4 Jan 2017 10:37:38 +0000 (10:37 +0000)]
Merge "HID Device role API fixes"
am:
f33a71d017
Change-Id: Ib7f524b7ad0bf63b852f2ffd4039d8b47ef7fc01
Neil Fuller [Wed, 4 Jan 2017 10:07:25 +0000 (10:07 +0000)]
Set isConnected, isBound, implCreated on server-side LocalSockets
Previously LocalServerSocket.accept() would return a LocalSocket
instance with isConnected, isBound and implCreated set to false.
[implCreated determines whether impl.create() needs to called].
A socket created via accept() in this way is implicitly bound
and connected. impl.create() does not need to be called because
impl.accept(LocalSocketImpl s) is called instead and has the same
effect (s.fd and s.mFdCreatedInternally set correctly).
This change modifies the behavior so that the flags are now all
set to true in this case and isBound() and isConnected() will
now return the correct answer.
Attempts to call bind() and connect() will still throw
IOException as before, but with a different exception message.
Correctly setting implCreated in LocalSocket means that
LocalSocketImpl.create() will no longer be called for accept()
created sockets and no longer needs to treat the "fd != null"
case as a no-op: we can now assert that there must be no fd set
when create() is called as we will no longer call it with sockets
created using accept().
Bug: https://code.google.com/p/android/issues/detail?id=35942
Test: Device boot
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalSocketTest.java
Change-Id: I3ac55439412e84501ae7c5ae6c9976e03b2d6fc5
Ivan Podogov [Wed, 4 Jan 2017 10:32:41 +0000 (10:32 +0000)]
Merge "HID Device role API fixes"
qinzhichao [Wed, 4 Jan 2017 06:51:33 +0000 (14:51 +0800)]
Fix NullPointerException in MediaPlayer
Issue detail:
https://code.google.com/p/android/issues/detail?id=231417
setSubtitleAnchor() is a synchronized method and has checked
mSubtitleController. So checking for null pointer is not
needed in scanInternalSubtitleTracks() method.
Signed-off-by: qinzhichao <qinzhichao@xiaomi.com>
Steven Moreland [Wed, 4 Jan 2017 05:11:06 +0000 (05:11 +0000)]
Merge "Add checked exceptions to HwBinder transact." am:
6c5cc261f8 am:
ca5d560090
am:
d38478cb50
Change-Id: Ic0c6eb87c57aca798ff167a71929f1a0e3132a75
Steven Moreland [Wed, 4 Jan 2017 05:07:06 +0000 (05:07 +0000)]
Merge "Add checked exceptions to HwBinder transact." am:
6c5cc261f8
am:
ca5d560090
Change-Id: I6d2dd373f83244e3fe61197cd704a3833a50329c
Steven Moreland [Wed, 4 Jan 2017 05:03:28 +0000 (05:03 +0000)]
Merge "Add checked exceptions to HwBinder transact."
am:
6c5cc261f8
Change-Id: I3bcac03a745722acd983dc4e7bdc31ae806bdbd4
Treehugger Robot [Wed, 4 Jan 2017 04:58:38 +0000 (04:58 +0000)]
Merge "Add checked exceptions to HwBinder transact."
Pavlin Radoslavov [Wed, 4 Jan 2017 03:49:09 +0000 (03:49 +0000)]
Merge "Add a mechanism for configuring the A2DP Source codecs" am:
63270f2b96 am:
8b46f87e7e
am:
da3de76bdb
Change-Id: If62a29812dad856d262c38804f3d88a5406ef79e
Pavlin Radoslavov [Wed, 4 Jan 2017 03:44:40 +0000 (03:44 +0000)]
Merge "Add a mechanism for configuring the A2DP Source codecs" am:
63270f2b96
am:
8b46f87e7e
Change-Id: I39e4b90491f646887200649954b652d9f5439925
Pavlin Radoslavov [Wed, 4 Jan 2017 03:39:50 +0000 (03:39 +0000)]
Merge "Add a mechanism for configuring the A2DP Source codecs"
am:
63270f2b96
Change-Id: I289d3b61e29b02bae208c656a6e963ff58248a15
Treehugger Robot [Wed, 4 Jan 2017 03:35:38 +0000 (03:35 +0000)]
Merge "Add a mechanism for configuring the A2DP Source codecs"
Pavlin Radoslavov [Wed, 21 Dec 2016 20:05:51 +0000 (12:05 -0800)]
Add a mechanism for configuring the A2DP Source codecs
* Added a new class BluetoothCodecConfig that contains codec-related
configuration or capabilities: codec type, priority, sample rate,
bits per sample, channel mode, and codec specific fields.
* Extended the Bluetooth A2DP AIDL interface to get/set the current
codec configuration
* Added new call handleBluetoothA2dpDeviceConfigChange() to the Media
Framework that is called when there are changes in the
Bluetooth A2DP device configuration - e.g., the A2DP codec is changed.
Test: A2DP streaming to headsets, TestPlans/71390
Bug:
30958229
Change-Id: I9a82716cbc2a5efbe77352a031ac80c88f6a2459
Android Build Merger (Role) [Wed, 4 Jan 2017 01:50:02 +0000 (01:50 +0000)]
Merge "docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345 am:
e102ea7b96" into nyc-mr2-dev-plus-aosp
Kevin Hufnagle [Wed, 4 Jan 2017 01:49:24 +0000 (01:49 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345
am:
e102ea7b96
Change-Id: I02c5fb6d5540cb91d7014e28a45c7b005bbceab7
Kevin Hufnagle [Wed, 4 Jan 2017 01:49:20 +0000 (01:49 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d am:
63d1963345
am:
c580c3401a
Change-Id: I66640153bd0dcaeca11f1e82fc0d721d995281ff
Kevin Hufnagle [Wed, 4 Jan 2017 01:45:26 +0000 (01:45 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d
am:
63d1963345
Change-Id: I586a41814eb4f0d15d411e03b80c02dfa782b5eb
Kevin Hufnagle [Wed, 4 Jan 2017 01:45:22 +0000 (01:45 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0 am:
fb99d1450d
am:
63d1963345
Change-Id: Ie101eda01c3b772c0944c56cfede1514acadf1e1
Kevin Hufnagle [Wed, 4 Jan 2017 01:43:01 +0000 (01:43 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214
am:
c54a1a07da
Change-Id: I93e0e5d79a8e59ca09d1a642cfe0f690e044a6b9
Kevin Hufnagle [Wed, 4 Jan 2017 01:41:25 +0000 (01:41 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7 am:
d7c1e9bcd0
am:
fb99d1450d
Change-Id: Ibe527fb777ca3975fed67a951f2ddb8f2b81a833
Android Build Merger (Role) [Wed, 4 Jan 2017 01:39:24 +0000 (01:39 +0000)]
Merge "Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214 am:
75896821cb" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Wed, 4 Jan 2017 01:38:52 +0000 (01:38 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d am:
8f8f62a499" into nyc-mr2-dev-plus-aosp
Kevin Hufnagle [Wed, 4 Jan 2017 01:38:51 +0000 (01:38 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555 am:
d99f3b7214
am:
75896821cb
Change-Id: I167f5334490ec6ebdedd7a27a3dfd091f20a760a
Kevin Hufnagle [Wed, 4 Jan 2017 01:38:19 +0000 (01:38 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d
am:
8f8f62a499
Change-Id: I2fcfba34f1585b5f0bb44e7ebd445f3fca088b29
Kevin Hufnagle [Wed, 4 Jan 2017 01:37:51 +0000 (01:37 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2 am:
01e3564a0d
am:
c2aae1a1e7
Change-Id: I6c8f8c224b33c46da62c66765608b02125af8598
Kevin Hufnagle [Wed, 4 Jan 2017 01:37:00 +0000 (01:37 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50 am:
c32df53fc7
am:
d7c1e9bcd0
Change-Id: I7f9ce1b661f8defca2918eece234a9c26d5f08a3
Kevin Hufnagle [Wed, 4 Jan 2017 01:36:01 +0000 (01:36 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555
am:
d99f3b7214
Change-Id: I62cf43c6bb6e7ddbd9464243362f1c62fc79589f
Kevin Hufnagle [Wed, 4 Jan 2017 01:33:39 +0000 (01:33 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc am:
b7c9651555
am:
d99f3b7214
Change-Id: I9a86dda9da8d525a23af69817044453fdf083ee4
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:55 +0000 (01:32 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2
am:
01e3564a0d
Change-Id: Iaed661507e97025f1b0c12aa9e808c006c184cac
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:53 +0000 (01:32 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85 am:
1c85b504e2
am:
01e3564a0d
Change-Id: Ic1454c9328a54777ba21cdee438e8d1bf91d5130
Kevin Hufnagle [Wed, 4 Jan 2017 01:32:24 +0000 (01:32 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38 am:
4418907d50
am:
c32df53fc7
Change-Id: Ib2ac681a13b8d3b80feba803f25fdc8dbdcfe4f9
Kevin Hufnagle [Wed, 4 Jan 2017 01:29:30 +0000 (01:29 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5 am:
2ff9c02bdc
am:
b7c9651555
Change-Id: I8c06b2b162ca5837ba9157ef91bb5a8d1489e36a
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:19 +0000 (01:28 +0000)]
docs: Added descriptions of IAB subscription-specific settings. am:
145b377b38
am:
4418907d50
Change-Id: I486f53410a427f373daec719bac522289d812e7a
Kevin Hufnagle [Wed, 4 Jan 2017 01:28:17 +0000 (01:28 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef am:
c8ccc66e85
am:
1c85b504e2
Change-Id: Iabd407dce1b3f01da5bbbd576536d0b77415d300
Kevin Hufnagle [Wed, 4 Jan 2017 01:25:12 +0000 (01:25 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am:
dbe9b81ef5
am:
2ff9c02bdc
Change-Id: I930313b754635e07b190793c3b79de39b71b6b8a
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:24 +0000 (01:24 +0000)]
docs: Added descriptions of IAB subscription-specific settings.
am:
145b377b38
Change-Id: I1b7a0885f613beb9b7baba8a6b35b59f00989ff3
Kevin Hufnagle [Wed, 4 Jan 2017 01:24:23 +0000 (01:24 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs am:
98a11580ef
am:
c8ccc66e85
Change-Id: Id17c38ec7f6b85bcbfaaf676bf3a2f1414fca893
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:51 +0000 (01:18 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
am:
dbe9b81ef5
Change-Id: Ie08ac386f441b16451538e21dcc8d5e5052258b0
Kevin Hufnagle [Wed, 4 Jan 2017 01:18:47 +0000 (01:18 +0000)]
docs: Added note - test subscriptions cannot use reserved IDs
am:
98a11580ef
Change-Id: I2c44d24b772d3df80dabab418875a1e9842aebbf
Kevin Hufnagle [Wed, 4 Jan 2017 01:14:21 +0000 (01:14 +0000)]
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev
Steven Moreland [Tue, 20 Dec 2016 23:55:48 +0000 (15:55 -0800)]
Add checked exceptions to HwBinder transact.
Bug:
33673120
Test: hidl_test_java
Merged-In: I7b62eb6b066fc24c44ef7e46aaa2a3208c053d11
Change-Id: I7b62eb6b066fc24c44ef7e46aaa2a3208c053d11
Adrian Roos [Wed, 4 Jan 2017 00:06:23 +0000 (00:06 +0000)]
Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev
am:
f39f98f562
Change-Id: Idf706cf94602615e746fe51c8ac17acde4258829
dooyoung.hwang [Wed, 4 Jan 2017 00:06:17 +0000 (00:06 +0000)]
QS - Fix race condition in accessibility
am:
acf90acf13
Change-Id: I8ecbc3f40c58dd56f94c00a452a6d84461ee698e
Adrian Roos [Wed, 4 Jan 2017 00:01:04 +0000 (00:01 +0000)]
Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev
Ivan Podogov [Fri, 30 Dec 2016 14:43:29 +0000 (14:43 +0000)]
HID Device role API fixes
This change makes HIDD API more like the other ones, i.e.
supporting multiple devices, and implements missing methods.
While the underlying implementation may still only support a
single device at a time, the "device" parameter can still be
useful for checking if the application is trying to send the
data to a correct device.
Test: make
Change-Id: I55fe04c0762a96fcddd6c6678e790361d648111a
Jeremy Joslin [Wed, 28 Dec 2016 18:32:46 +0000 (10:32 -0800)]
New permission - BIND_NETWORK_RECOMMENDATION_SERVICE.
Used to protect exported network recommendation services.
Test: Built & ran
BUG:
33897544
Change-Id: Icfc566275a8d832449f6358e576784199ab0f7b2
Merged-In: I4f163fb965be6a25201bc3ba5e0032e7652c8f20
Marie Janssen [Tue, 3 Jan 2017 20:28:01 +0000 (20:28 +0000)]
Bluetooth: track enabling in dumpsys
am:
a50cc71471
Change-Id: Ifacdcb4c28d6a3a5b745434e1f6ae83c3688f7a9
Jeff Sharkey [Tue, 3 Jan 2017 19:48:36 +0000 (19:48 +0000)]
Merge "Offer to measure disk stats using quotas." am:
f8720b95be am:
4b80a4a372
am:
1e1cdbead1
Change-Id: Ic00acfb0efb6188a15357322528075d41467310b
Robert Greenwalt [Tue, 3 Jan 2017 19:35:37 +0000 (11:35 -0800)]
resolve merge conflicts of
e6b6653da899 to nyc-mr2-dev-plus-aosp
Change-Id: Ifbbe0d2758ab25aee7001412f71b0445c62cbdac
Jeff Sharkey [Tue, 3 Jan 2017 19:31:36 +0000 (19:31 +0000)]
Merge "Offer to measure disk stats using quotas." am:
f8720b95be
am:
4b80a4a372
Change-Id: I2ab9a2bd2ff60cafea332998789ad947dda0140b
Jeff Sharkey [Tue, 3 Jan 2017 19:24:00 +0000 (19:24 +0000)]
Merge "Offer to measure disk stats using quotas."
am:
f8720b95be
Change-Id: I56bab3ec4895c232ce8287623827c20f2dbfaaf6
Jeff Sharkey [Tue, 3 Jan 2017 19:08:07 +0000 (19:08 +0000)]
Merge "Offer to measure disk stats using quotas."
Marie Janssen [Wed, 28 Dec 2016 22:13:21 +0000 (14:13 -0800)]
Bluetooth: track enabling in dumpsys
Move basic state dumpsys to here from AdapterService.
Track which apps are enabling and disabling Bluetooth, including BLE
apps, and show the apps in the dumpsys logs.
Test: start phone and enable/disable, take bug report
Bug:
33692282
Change-Id: I6ea62ebdcfd7873d0be1bb5c5c520bbce3737a40
(cherry picked from commit
5980456040217f330289e3fa59df4efaafb1c6c5)
Robert Greenwalt [Tue, 3 Jan 2017 17:40:27 +0000 (17:40 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause" am:
43ced5941e
am:
14a5b810b6
Change-Id: Ib7a87a5028975e8f55dd6ba311cde78a3c1c2460
Robert Greenwalt [Tue, 3 Jan 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
am:
43ced5941e
Change-Id: I5457b80932f4bb155bf136fc4e05199f04ca7e7c
Robert Greenwalt [Tue, 3 Jan 2017 17:26:58 +0000 (17:26 +0000)]
Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
Jeff Sharkey [Tue, 13 Dec 2016 15:44:51 +0000 (08:44 -0700)]
Offer to measure disk stats using quotas.
Now we're getting somewhere! This CL starts measuring disk usage
using quotactl(), which is almost instant and has much lower impact
on flash memory lifetime.
We now grant the per-app cache GID to every launched app, and the
ContextImpl logic that creates cache directories matches the logic
down in installd.
Test: builds, boots, quota stats match manual stats
Bug:
27948817
Change-Id: Ie269a2958ce0e1c17cb74dbfecc791a5c12922cf
OSDN Git Service
