Treehugger Robot
c7c899bbe2
Merge "Fix NullPointerException in MediaPlayer"
2017-01-04 17:23:07 +00:00
Makoto Onuki
fd24353d75
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
2017-01-04 09:04:09 -08:00
Kang Li
a5e50e2612
Merge "Log metrics for Smart-Sharing in ChooserActivity."
2017-01-04 16:09:05 +00:00
Kang Li
97a8d70386
Merge "Rank apps by Logistic Regression for Smart-Sharing."
2017-01-04 16:08:25 +00:00
Android Build Merger (Role)
525aa0d99f
Merge "Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d am: a169fc3494 am: 8be80273b8 am: a1a9676317 -s ours"
2017-01-04 15:43:53 +00:00
Jeremy Joslin
5780e1f4a5
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d am: a169fc3494 am: 8be80273b8
...
am: a1a9676317
2017-01-04 15:43:11 +00:00
TreeHugger Robot
7dfe29f010
Merge "Propagate ephemeral flag from adb install to PackageParser"
2017-01-04 15:42:34 +00:00
Jeremy Joslin
a1a9676317
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d am: a169fc3494
...
am: 8be80273b8
2017-01-04 15:38:43 +00:00
Chris Wren
c94096f748
Merge "fix race in getAppActiveNotifications"
2017-01-04 15:38:43 +00:00
Jeremy Joslin
8be80273b8
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d
...
am: a169fc3494
2017-01-04 15:34:16 +00:00
Jeremy Joslin
a169fc3494
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
...
am: 871beedc6d
2017-01-04 15:29:57 +00:00
Treehugger Robot
871beedc6d
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
2017-01-04 15:24:30 +00:00
Wyatt Riley
d4cbb981c1
Merge "Removing @removed methods and constants"
2017-01-04 14:10:14 +00:00
Neil Fuller
7f6136ae03
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am: 75ba827a4e am: 6a29676687 am: df49ab5576
...
am: 88c9e31fd3
2017-01-04 12:51:54 +00:00
Neil Fuller
88c9e31fd3
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am: 75ba827a4e am: 6a29676687
...
am: df49ab5576
2017-01-04 12:45:11 +00:00
Neil Fuller
df49ab5576
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am: 75ba827a4e
...
am: 6a29676687
2017-01-04 12:38:50 +00:00
Neil Fuller
6a29676687
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
...
am: 75ba827a4e
2017-01-04 12:32:29 +00:00
Treehugger Robot
75ba827a4e
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
2017-01-04 12:26:49 +00:00
Ivan Podogov
c8daa78a42
Merge "HID Device role API fixes" am: f33a71d017 am: a7d58fecc6 am: 8e2e2b1381
...
am: daa72ea3ab
2017-01-04 10:48:34 +00:00
Ivan Podogov
daa72ea3ab
Merge "HID Device role API fixes" am: f33a71d017 am: a7d58fecc6
...
am: 8e2e2b1381
2017-01-04 10:45:33 +00:00
Ivan Podogov
8e2e2b1381
Merge "HID Device role API fixes" am: f33a71d017
...
am: a7d58fecc6
2017-01-04 10:41:26 +00:00
Ivan Podogov
a7d58fecc6
Merge "HID Device role API fixes"
...
am: f33a71d017
2017-01-04 10:37:38 +00:00
Neil Fuller
b08c7bc0bd
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
2017-01-04 10:33:18 +00:00
Ivan Podogov
f33a71d017
Merge "HID Device role API fixes"
2017-01-04 10:32:41 +00:00
Joe LaPenna
25b4602cdc
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
2017-01-04 00:44:25 -08:00
qinzhichao
30d4a498c4
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 >
2017-01-04 14:51:33 +08:00
Steven Moreland
b930455f72
Merge "Add checked exceptions to HwBinder transact." am: 6c5cc261f8 am: ca5d560090 am: d38478cb50
...
am: 3b20d72697
2017-01-04 05:15:18 +00:00
Steven Moreland
3b20d72697
Merge "Add checked exceptions to HwBinder transact." am: 6c5cc261f8 am: ca5d560090
...
am: d38478cb50
2017-01-04 05:11:06 +00:00
Steven Moreland
d38478cb50
Merge "Add checked exceptions to HwBinder transact." am: 6c5cc261f8
...
am: ca5d560090
2017-01-04 05:07:06 +00:00
Steven Moreland
ca5d560090
Merge "Add checked exceptions to HwBinder transact."
...
am: 6c5cc261f8
2017-01-04 05:03:28 +00:00
Treehugger Robot
6c5cc261f8
Merge "Add checked exceptions to HwBinder transact."
2017-01-04 04:58:38 +00:00
Pavlin Radoslavov
858ab99071
Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e am: da3de76bdb
...
am: 62c5226e9c
2017-01-04 03:54:18 +00:00
Pavlin Radoslavov
62c5226e9c
Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e
...
am: da3de76bdb
2017-01-04 03:49:09 +00:00
Pavlin Radoslavov
da3de76bdb
Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96
...
am: 8b46f87e7e
2017-01-04 03:44:40 +00:00
TreeHugger Robot
8e514b7864
Merge "Tracing for unaccounted parts"
2017-01-04 03:41:21 +00:00
Pavlin Radoslavov
8b46f87e7e
Merge "Add a mechanism for configuring the A2DP Source codecs"
...
am: 63270f2b96
2017-01-04 03:39:50 +00:00
Treehugger Robot
63270f2b96
Merge "Add a mechanism for configuring the A2DP Source codecs"
2017-01-04 03:35:42 +00:00
Sergei Vasilinetc
0aa99e77fa
Merge changes from topics 'hw_prohibit_copy_buffer', 'hw_create_immutable_bitmap', 'recycled_getConfig'
...
* changes:
Prohibit copyPixelsToBuffer & copyPixelsFromBuffer
HardwareBitmaps: support createBitmap methods that return immutable bitmap
Fix getConfig on recycled bitmap
2017-01-04 03:18:25 +00:00
Vadim Tryshev
8957f2ddda
Introducing teleportation between sections.
...
The key combos differ from the ones in the spec because key combos
including Meta key don’t get delivered to apps. To fix this, I’ll
implement necessary plumbing after the feature freeze. Meanwhile,
temporary combos are used.
Given that the section and cluster teleportation have a lot in common,
I’m not introducing new methods, but adding a param to the cluster
teleportation ones. I should have also changed the names to something
like findNextKeyboardNavigationCluster => findNextFocusGroup, where
“FocusGroup” is a generalized name for clusters and sections.
However, that name depends on b/33708251, so I’m not doing it now. I
don’t rename existing identifiers, and using “focusGroup” for new
ones. Admittedly, this creates mess that will be resolved based on
the outcome of the mentioned bug.
Bug: 32151632
Test: Manual checks; CTS are coming after feature freeze
Change-Id: I01b5d6e5a9689b8f643fa4af695d2ce61265f374
2017-01-03 18:18:36 -08:00
TreeHugger Robot
b3afd3d29a
Merge "Add checked exceptions to HwBinder transact."
2017-01-04 02:15:31 +00:00
Kevin Hufnagle
ec697f27d3
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
...
am: ab61a70601
2017-01-04 01:56:54 +00:00
Kevin Hufnagle
75b37c09db
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 am: d7c1e9bcd0 am: fb99d1450d am: 63d1963345 am: e102ea7b96
...
am: 35f2186a3d
2017-01-04 01:56:45 +00:00
Fyodor Kupolov
6dd2ba2866
Tracing for unaccounted parts
...
Bug: 33199244
Test: manual
Change-Id: Idf71332e8ebd666e5e0defada696414b4550ff23
2017-01-03 17:55:44 -08:00
Kevin Hufnagle
b5936940e8
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 am: d7c1e9bcd0 am: fb99d1450d am: 63d1963345 am: c580c3401a
...
am: a4a0906431
2017-01-04 01:55:18 +00:00
Pavlin Radoslavov
44a4ef0aa9
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
2017-01-03 17:52:52 -08:00
Kevin Hufnagle
afe1059af8
Merge "docs: Added note - test subscriptions cannot use reserved IDs" into nyc-dev am: dbe9b81ef5 am: 2ff9c02bdc am: b7c9651555 am: d99f3b7214 am: c54a1a07da
...
am: 2a5e90da6b
2017-01-04 01:50:22 +00:00
Android Build Merger (Role)
ab61a70601
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
2017-01-04 01:50:04 +00:00
Kevin Hufnagle
35f2186a3d
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 am: d7c1e9bcd0 am: fb99d1450d am: 63d1963345
...
am: e102ea7b96
2017-01-04 01:49:24 +00:00
Kevin Hufnagle
a4a0906431
docs: Added descriptions of IAB subscription-specific settings. am: 145b377b38 am: 4418907d50 am: c32df53fc7 am: d7c1e9bcd0 am: fb99d1450d am: 63d1963345
...
am: c580c3401a
2017-01-04 01:49:20 +00:00
Kevin Hufnagle
5d34519e65
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
...
am: c22fe7906a
2017-01-04 01:47:43 +00:00
