git.osdn.net Git - android-x86/frameworks-base.git/log

Bluetooth: Use elapsed real time for calculating onDuration

The system time can change after boot. Using elapsed real time avoids
this problem.

Test: start factory reset device, adb shell dumpsys bluetooth_manager
Change-Id: Ieea2a2bc8b4bcb375897e609275207b6c3eccdce
Fixes: 62985817

commit | commitdiff | tree

Koji Fukui [Wed, 15 Nov 2017 02:35:18 +0000 (02:35 +0000)]

Merge "Remove AutofillManagerClient after AutofillManager is finalized"
am: dd5384a4fe

Change-Id: If0b092c5e18005fb4b8c1fd8405f4d666c98de5a

commit | commitdiff | tree

Treehugger Robot [Wed, 15 Nov 2017 02:23:27 +0000 (02:23 +0000)]

Merge "Remove AutofillManagerClient after AutofillManager is finalized"

commit | commitdiff | tree

Xin Li [Tue, 14 Nov 2017 20:31:11 +0000 (12:31 -0800)]

Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d

commit | commitdiff | tree

yinxu [Tue, 14 Nov 2017 20:25:16 +0000 (20:25 +0000)]

Merge "Fix the comments of onError() callback"
am: 5f291e5e06

Change-Id: If034888c0baeaae882e150eff477083974541541

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Nov 2017 20:12:02 +0000 (20:12 +0000)]

Merge "Fix the comments of onError() callback"

commit | commitdiff | tree

Tianran Li [Tue, 14 Nov 2017 19:47:34 +0000 (19:47 +0000)]

Merge "TimePickerDialog OTG keyboard entry discarded"
am: 8c2cb6ff08

Change-Id: Ib28468e637c146e69d59ee352b5a019654b3dc14

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Nov 2017 19:35:20 +0000 (19:35 +0000)]

Merge "TimePickerDialog OTG keyboard entry discarded"

commit | commitdiff | tree

Jeff Sharkey [Tue, 14 Nov 2017 17:04:06 +0000 (17:04 +0000)]

Merge "Better, consistent definition of AID_SHARED_GID."
am: 7e875df695

Change-Id: Ifad7e44a21aeebdeaab3b31c93ece145f86a1cb9

commit | commitdiff | tree

Cassie [Tue, 14 Nov 2017 16:57:15 +0000 (16:57 +0000)]

Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
am: 45e1c58591

Change-Id: Ic4da1daf9e47e064068d007f3e5a4fff3d8ef2e6

commit | commitdiff | tree

Jeff Sharkey [Tue, 14 Nov 2017 16:49:30 +0000 (16:49 +0000)]

Merge "Better, consistent definition of AID_SHARED_GID."

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Nov 2017 16:42:41 +0000 (16:42 +0000)]

Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."

commit | commitdiff | tree

Hugo Benichi [Fri, 10 Nov 2017 23:06:43 +0000 (08:06 +0900)]

IP connectivity metrics: fix LINGER/UNLINGER logging

This patch fixes a regression introduced by commit 97bfd276fb008
for logging NetworkEvents when lingering and unlingering a network.

Commit 97bfd276fb008 removed an overloaded constructor for the
NetworkEvent class, which caused NetworkEvents with event type of
LINGER or UNLINGER logged in ConnectivityService to have incorrect
event types (set to the network id instead) and incorrect duration
(set as the event type instead).

Bug: 34901696
Test: runtest frameworks-net
Change-Id: Iab97a58ca805413617c8e8b4553404625a820ceb

commit | commitdiff | tree

Paul Duffin [Tue, 14 Nov 2017 13:15:37 +0000 (13:15 +0000)]

Merge "Stop using c.a.i.u.Predicate outside test-runner"
am: ee2fb3c59e

Change-Id: I197bd9e2458ff9f966754c459ee77f03c3517eb5

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Nov 2017 13:05:20 +0000 (13:05 +0000)]

Merge "Stop using c.a.i.u.Predicate outside test-runner"

commit | commitdiff | tree

Paul Duffin [Tue, 14 Nov 2017 10:11:18 +0000 (10:11 +0000)]

Stop using c.a.i.u.Predicate outside test-runner

This class has been deprecated and should only be used in the
frameworks/base/test-runner directory.

Bug: 30188076
Test: make checkbuild
Change-Id: I61059a96aa6045c44546239b94b329c02bb745a1

commit | commitdiff | tree

Niklas Brunlid [Thu, 2 Nov 2017 08:26:37 +0000 (09:26 +0100)]

Avoid overflow in focus fudge calculation

When comparing decoding the next View to get focus, the last-resort
calculation (magic number and square of distance between the View
corners) could overflow, giving a false positive. This causes the
focus to jump around in certain cases. Change from int to long to
avoid in the foreseeable future.

Test: Manual
- Use a phone with an 18:9 ratio (1080*2160)
- make FrameworksCoreTests
- adb install -r out/target/product/aurora/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
- adb shell am instrument -r -w -e class android.widget.scroll.ScrollViewButtonsAndLabelsTest#testArrowScrollUpOffScreenVerticalFadingEdge com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I119cd66f563cfa312c2304bb910c27075e674e59

commit | commitdiff | tree

Calin Juravle [Tue, 14 Nov 2017 03:03:56 +0000 (03:03 +0000)]

Merge "Create secondary dex profiles relative to the provided dex path"
am: f7f5732e2c

Change-Id: I6f2eb760e07959e26d46f8a0f3d4b4358b9a5a1e

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Nov 2017 02:54:59 +0000 (02:54 +0000)]

Merge "Create secondary dex profiles relative to the provided dex path"

commit | commitdiff | tree

Calin Juravle [Tue, 5 Sep 2017 00:32:23 +0000 (17:32 -0700)]

Create secondary dex profiles relative to the provided dex path

We previously used the realpath to simplify the validation and processing
in installd. However it ended up making things more complicated when
cleaning up the profiles, especially because of /data/user/0 symlinks to
/data/data/.

Instead of using the realpath of the dex file to compute the profile
location, use the file path as given. This makes things consistent with
DexManager registration and allows for easier dex file reconciliation in
the presence of symlinks.

Bug: 64460009
Test: manual

(cherry picked from commit c119c5a8c1d8e3ba6c90300a82d2086273d0d3f3)

Merged-In: I2362f32a679324d4bc1e8a0fe83b5b17ee523e7a
Change-Id: Ic9c38a920c5eef85f26ac33f2b8a37c3694bfbad

commit | commitdiff | tree

brycelee [Mon, 13 Nov 2017 23:30:22 +0000 (23:30 +0000)]

Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities."
am: 62893396bd -s ours

Change-Id: If48b9be41b03c30a5eeed2d497f99535c2c82219

commit | commitdiff | tree

brycelee [Mon, 13 Nov 2017 23:21:09 +0000 (23:21 +0000)]

Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities."

commit | commitdiff | tree

ludi [Mon, 16 Oct 2017 22:09:41 +0000 (15:09 -0700)]

Add test case for user quota management in IpSecService

Test: runtest frameworks-net
Bug: 65688605
Change-Id: I3210c4920d0ac1d09fecb56c25e392e2bcba641f

commit | commitdiff | tree

Jordan Liu [Mon, 13 Nov 2017 22:02:52 +0000 (22:02 +0000)]

Merge "Customize the default value of Enhanced 4G LTE mode"
am: 0f113b2f25

Change-Id: I85dde983b57cf901e710cd1f1ac3e409b3b7976e

commit | commitdiff | tree

Jordan Liu [Mon, 13 Nov 2017 21:53:24 +0000 (21:53 +0000)]

Merge "Customize the default value of Enhanced 4G LTE mode"

commit | commitdiff | tree

Bryce Lee [Tue, 31 Oct 2017 22:40:33 +0000 (15:40 -0700)]

DO NOT MERGE Remove orientation restriction to only fullscreen activities.

This changelist removes checks that enforce that only fullscreen,
opaque activities may request orientation changes. An application
may itself be compatible with the change and update their SDK level.
However, it is possible they use a library that has not itself been
updated and still leverages this feature for non-fullscreen
activities.

Fixes: 68684796
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests

Change-Id: I75bbda96b132694c722b0b535e33ea5e1b9a55db

commit | commitdiff | tree

Koji Fukui [Mon, 13 Nov 2017 20:53:35 +0000 (20:53 +0000)]

Merge "Stop observing death of PrintManager listener when it is removed"
am: e7240a52e2

Change-Id: Idc81f05fe3820d1bcbfd81d6497c0608ef37fae3

commit | commitdiff | tree

Treehugger Robot [Mon, 13 Nov 2017 20:42:09 +0000 (20:42 +0000)]

Merge "Stop observing death of PrintManager listener when it is removed"

commit | commitdiff | tree

Cassie [Fri, 10 Nov 2017 00:19:19 +0000 (16:19 -0800)]

Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.

Bug: 69096589
Bug: 63984327
Test: Basic telephony sanity
Change-Id: I0fe5b3a17b1a68c918f912ee98a00cfec4c5657b

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Nov 2017 13:24:10 +0000 (13:24 +0000)]

Merge "IP connectivity metrics: NetworkEvents have transports"
am: f8fdb06c27

Change-Id: I92dfce6a78de18036ca0b54fdf2ee95e715c678b

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Nov 2017 13:13:44 +0000 (13:13 +0000)]

Merge "IP connectivity metrics: NetworkEvents have transports"

commit | commitdiff | tree

Tianran Li [Wed, 22 Mar 2017 11:38:19 +0000 (20:38 +0900)]

TimePickerDialog OTG keyboard entry discarded

A user can manually enter time value using a keyboard.
NumberPicker then evaluates its value when focus is changed.
Currently when the dialog is closed by pressing OK, the value
from the focused NumberPicker is not taken into consideration.

To ensure retrieval of the correct value when closing the
dialog, the focus must be removed from the NumberPicker as
is done in DatePickerDialog.

Bug: 65664546
Test: Manual
      1. Connect physical keyboard via OTG connector
      2. Enter Settings and set time manually
      3. Select keyboard entry
      4. Change time and tap OK
      The entered time should be applied
Change-Id: I8a77cb3aaa54acb228ec1ce0e9385e2eb5e88e9b

commit | commitdiff | tree

Koji Fukui [Fri, 20 Oct 2017 07:42:51 +0000 (16:42 +0900)]

Stop observing death of PrintManager listener when it is removed

Symptom:
Global reference table overflow happens on system_server.

Root cause:
When a listener is added to the PrintManager, death notification for
the listener is registered. So the listener is added to global
reference table.
But the death notification is not unregistered when the listener is
removed from PrintManager. The listener isn't removed from the global
reference table until client process die. If client process repeatedly
add/remove listener, the global reference table overflow.

Solution:
Call unlinkToDeath() when the listener is removed from PrintManager.

Test: cts-tradefed run cts-dev -m Print
Bug: 68746445
Change-Id: I0b133e4607317a15e51bdf6e1248552dcc920d6d

commit | commitdiff | tree

Hugo Benichi [Fri, 10 Nov 2017 23:06:43 +0000 (08:06 +0900)]

IP connectivity metrics: NetworkEvents have transports

Also removes netId field from inside NetworkEvent and stop populating
the network_id field of the NetworkEvent field, deprecating it.

Bug: 34901696
Test: runtest frameworks-net,
manually looking at $ adb shell dumpsys connmetrics

Change-Id: I2c36860f976898883714f72f4d18e06da250c6a6

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Nov 2017 04:06:11 +0000 (04:06 +0000)]

Merge "Add L2~L4 information to packet wakeup logs and metrics"
am: 6ee20ca7d3

Change-Id: I8fea75c477d4b5fbbded7dee2dff8644c6f97241

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Nov 2017 03:58:34 +0000 (03:58 +0000)]

Merge "Add L2~L4 information to packet wakeup logs and metrics"

commit | commitdiff | tree

Hugo Benichi [Sun, 12 Nov 2017 22:36:21 +0000 (22:36 +0000)]

Merge "Add Network security watchlist service"
am: e672ab4c0a

Change-Id: I3e3d8dbc220879752826faa7570f04585c2f1107

commit | commitdiff | tree

Hugo Benichi [Sun, 12 Nov 2017 22:24:56 +0000 (22:24 +0000)]

Merge "Add Network security watchlist service"

commit | commitdiff | tree

Ricky Wai [Fri, 27 Oct 2017 13:46:01 +0000 (14:46 +0100)]

Add Network security watchlist service

Partial cherry pick from commit 1a6e667cb6e9211908d02eb21c50c006473376f9
adding a new INetdEventCallback type.

Bug: 63908748
Test: built, flashed, $ runtest frameworks-net
Change-Id: I1b95cc4e5cbbfbdbd7429d61e2dcb67b90d278bb
Merged-In: I09595178bac0070a867bc5e0501a7bf2c840e398

commit | commitdiff | tree

Hugo Benichi [Thu, 12 Oct 2017 12:33:40 +0000 (21:33 +0900)]

Add L2~L4 information to packet wakeup logs and metrics

Example of $ adb shell dumpsys connmetrics list:
...
WakeupStats(wlan0, 21851s, total: 85, root: 0, system: 4, apps: 63, non-apps: 0, no uid: 18, l2 unicast/multicast/broadcast: 85/0/0, ethertype 0x800: 23, ethertype 0x86dd: 62, ipNxtHdr 6: 74, ipNxtHdr 17: 1, ipproto 58: 10)
...
WakeupEvent(06:55:54.094, wlan0, -1, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=216.58.200.110, dstIp=100.112.108.29, srcPort=443, dstPort=46878)
WakeupEvent(06:57:14.379, wlan0, -1, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=58, srcIp=ff02::1, dstIp=fe80::fa00:4:fd00:1)
WakeupEvent(06:57:52.786, wlan0, 1000, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=172.217.27.67, dstIp=100.112.108.29, srcPort=80, dstPort=49360)
WakeupEvent(06:58:02.919, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:809::200a, srcPort=443, dstPort=46197)
WakeupEvent(06:58:05.586, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:803::200a, srcPort=443, dstPort=46096)

Bug: 66869042
Test: runtest frameworks-net
+ manual testing by monitoring $ dumpsys connmetrics list
Change-Id: I03215c0c9fb7feda3e6ceb1b916f61f4ffb15344

commit | commitdiff | tree

Pirama Arumuga Nainar [Sat, 11 Nov 2017 13:37:00 +0000 (13:37 +0000)]

Merge "Remove GCC-specific pragma and disabled Clang warning"
am: bcf27fa6a7

Change-Id: If8aa81372dd6fcc433867892e27c37670184fbc6

commit | commitdiff | tree

Treehugger Robot [Sat, 11 Nov 2017 13:29:23 +0000 (13:29 +0000)]

Merge "Remove GCC-specific pragma and disabled Clang warning"

commit | commitdiff | tree

Jakub Pawlowski [Sat, 11 Nov 2017 00:22:27 +0000 (00:22 +0000)]

Merge "Move connectSocket into IBluetoothSocketManager (3/3)"
am: 8d742759cc

Change-Id: Id850f587e6ee58b18ffbe1651c0526a7fd39491f

commit | commitdiff | tree

Jakub Pawlowski [Sat, 11 Nov 2017 00:13:41 +0000 (00:13 +0000)]

Merge "Move connectSocket into IBluetoothSocketManager (3/3)"

commit | commitdiff | tree

Pirama Arumuga Nainar [Fri, 10 Nov 2017 21:51:10 +0000 (13:51 -0800)]

Remove GCC-specific pragma and disabled Clang warning

Bug: http://b/68236396

Do not suppress the GCC-specific -Wunused-but-set-variable warning,
which Clang doesn't support.

Test: Build the topic
Change-Id: Ibeaaf927f44fe65f939d3d728c6fe642bcca595f

commit | commitdiff | tree

Jakub Pawlowski [Mon, 6 Nov 2017 20:17:30 +0000 (12:17 -0800)]

Move connectSocket into IBluetoothSocketManager (3/3)

Bug: 68359837
Test: none
Merged-In: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Change-Id: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12

commit | commitdiff | tree

Hall Liu [Fri, 10 Nov 2017 21:14:01 +0000 (21:14 +0000)]

Merge changes from topics "embms-cts-6", "embms-cts-5"
am: f6b2b77e40

Change-Id: I1c740fee4e612253098aa56ebdb70dafc83c6f43

commit | commitdiff | tree

Hall Liu [Fri, 10 Nov 2017 21:10:01 +0000 (21:10 +0000)]

Add @TestApi for DownloadStateCallback CTS
am: 63c5fd60ac

Change-Id: I3ffa9e070f014a0280486cd5a9a58af205ac7aab

commit | commitdiff | tree

Hall Liu [Fri, 10 Nov 2017 20:46:19 +0000 (20:46 +0000)]

Merge changes from topics "embms-cts-6", "embms-cts-5"

* changes:
Add @TestApi for MbmsDownloadReceiver CTS
Add @TestApi for DownloadStateCallback CTS

commit | commitdiff | tree

Hall Liu [Fri, 10 Nov 2017 19:58:20 +0000 (19:58 +0000)]

Merge "Update Telecom APIs to include multi-hfp"
am: 025718e8f6

Change-Id: I08e0646c4dc20d45ea50d43d7e8b0deddf147bda

commit | commitdiff | tree

Hall Liu [Fri, 10 Nov 2017 19:49:01 +0000 (19:49 +0000)]

Merge "Update Telecom APIs to include multi-hfp"

commit | commitdiff | tree

Tetsutoki Shiozawa [Fri, 10 Nov 2017 16:57:22 +0000 (16:57 +0000)]

Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"
am: 4741faa258

Change-Id: Ifc79d7ccd5d6837a39263b6ba9728f8b4d82f81d

commit | commitdiff | tree

Treehugger Robot [Fri, 10 Nov 2017 16:47:00 +0000 (16:47 +0000)]

Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"

commit | commitdiff | tree

Yoshinori Hirano [Fri, 10 Nov 2017 15:15:44 +0000 (15:15 +0000)]

Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am: a524e7d87d -s ours

Change-Id: I5af03e211cda75d016131db6001ac6b79836a018

commit | commitdiff | tree

Treehugger Robot [Fri, 10 Nov 2017 15:07:04 +0000 (15:07 +0000)]

Merge "Send broadcast when location mode is about to change DO NOT MERGE"

commit | commitdiff | tree

Victor Hsieh [Fri, 10 Nov 2017 10:32:37 +0000 (10:32 +0000)]

Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
am: 41f1ef8c02 -s ours

Change-Id: Icf296e0f93486f2ab9c9a1bdd6e8274b58341809

commit | commitdiff | tree

Treehugger Robot [Fri, 10 Nov 2017 10:22:17 +0000 (10:22 +0000)]

Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 10 Nov 2017 08:22:05 +0000 (08:22 +0000)]

Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"
am: 3e9b9b74b4

Change-Id: Ic98a1281eb6f3f6d1deb450c5123913b2c8d25a6

commit | commitdiff | tree

Treehugger Robot [Fri, 10 Nov 2017 08:11:26 +0000 (08:11 +0000)]

Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"

commit | commitdiff | tree

Yoshinori Hirano [Tue, 24 Oct 2017 09:23:09 +0000 (18:23 +0900)]

Send broadcast when location mode is about to change DO NOT MERGE

Send "com.android.settings.location.MODE_CHANGING" broadcast intent
when the location mode is about to be changed on Settings app or
Quick Settings.

Fixes: 28057031
Test: manual - turn the location setting on

Change-Id: Ia2db3554755a643609cfb5f0fc30f2dc2cc1beeb

commit | commitdiff | tree

Jayachandran Chinnakkannu [Fri, 10 Nov 2017 00:43:56 +0000 (00:43 +0000)]

Merge "Remove the OEM hook implementation and usage"
am: 413a308126

Change-Id: Ib81fa81a4a87f4378b9ab137a8c3eb5e386d1f0f

commit | commitdiff | tree

Jeff Sharkey [Fri, 10 Nov 2017 00:40:57 +0000 (17:40 -0700)]

Better, consistent definition of AID_SHARED_GID.

AID_SHARED_GID is a GID shared by a specific app across all users on
the same device. Bring the UserHandle and multiuser.c implementations
into agreement, and copy/paste the unit tests that verify that both
behave identically.

Since we might now return "-1" when a GID is invalid, have
ActivityManager handle these cases by quickly swapping in the
always-valid getUserGid().

Test: bit FrameworksCoreTests:android.os.UserHandleTest
Bug: 34151068, 64548938
Change-Id: I0463aba923ae5ce1942666359a394ae6cdb7c1f8

commit | commitdiff | tree

Jayachandran Chinnakkannu [Fri, 10 Nov 2017 00:31:39 +0000 (00:31 +0000)]

Merge "Remove the OEM hook implementation and usage"

commit | commitdiff | tree

Hall Liu [Wed, 8 Nov 2017 01:59:28 +0000 (17:59 -0800)]

Update Telecom APIs to include multi-hfp

* Add bluetooth devices to CallAudioState
* Add methods for specifying a bluetooth device to InCallService
* Add methods for specifying a bluetooth device to Connection (for
self-managed connections)

Bug: 64767509
Test: unit tests
Change-Id: I286b19b423dc2ee417dbc90eda7e8055b2da2444

commit | commitdiff | tree

Koji Fukui [Wed, 18 Oct 2017 08:48:40 +0000 (17:48 +0900)]

Remove AutofillManagerClient after AutofillManager is finalized

Symptom:
Global reference table overflow happens on system_server.

Root cause:
If a process repeatedly create a context and get AutofillManager
from the context, each BinderProxy of AutofillManagerClient are
registered to AutofillManagerServiceImpl. They aren't removed until
the process is died. BinderProxy consumes global reference and finally
causes crash on system_server.

Solution:
Remove AutofillManagerClient from AutofillManagerServiceImpl after
AutofillManager is finalized.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Bug: 68747744
Change-Id: I8b76c5368b54317b8696cac470cc390b36e910e7

commit | commitdiff | tree

Victor Hsieh [Thu, 9 Nov 2017 18:32:10 +0000 (10:32 -0800)]

DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob

Other than the renaming, the meaning is now opposite.

Test: build
Bug: 67415855
Bug: 63920015

Change-Id: I349c0b233079b5958e4a308d6c7ad9b3a54f157a

commit | commitdiff | tree

Jakub Pawlowski [Thu, 9 Nov 2017 22:30:31 +0000 (22:30 +0000)]

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
am: b2bde067c2

Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481

commit | commitdiff | tree

Jakub Pawlowski [Thu, 9 Nov 2017 22:25:29 +0000 (22:25 +0000)]

Add IBluetoothSocketManager (3/3)
am: 422af4d049

Change-Id: Ic246d5e4f5a62b3f201c700a007faaffe2ebf9e3

commit | commitdiff | tree

Jakub Pawlowski [Mon, 6 Nov 2017 20:16:25 +0000 (12:16 -0800)]

Move createSocketChannel into IBluetoothSocketManager (3/3)

Bug: 68359837
Test: none
Change-Id: I52b03ff3d637bf661c70279b7ca18b105157f7a2

commit | commitdiff | tree

Jakub Pawlowski [Thu, 9 Nov 2017 22:11:38 +0000 (22:11 +0000)]

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"

* changes:
Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)
Add IBluetoothSocketManager (3/3)

commit | commitdiff | tree

Hemant Gupta [Thu, 9 Nov 2017 21:51:52 +0000 (21:51 +0000)]

Merge "OBEX : Handle Negative index Exception"
am: 08d23cf07a

Change-Id: Icd513d2060cf1e8fe8fcd06bbedfc0ef5bf5a6fd

commit | commitdiff | tree

Treehugger Robot [Thu, 9 Nov 2017 21:12:43 +0000 (21:12 +0000)]

Merge "OBEX : Handle Negative index Exception"

commit | commitdiff | tree

Hemant Gupta [Wed, 28 Dec 2016 06:40:47 +0000 (12:10 +0530)]

OBEX : Handle Negative index Exception

Use case:
1. Send file to remote device.
2. Wait for accepting the file transfer on remote device.
   Use Specific remote device(that sends some
     optional headers).

Failure:
No file acceptance popup seen on remote device.

Root cause:
Crash in com.android.bluetooth.

FATAL EXCEPTION: BtOpp ClientThread
Process: com.android.bluetooth, PID: 22527
java.lang.NegativeArraySizeException: -3
at javax.obex.ObexHelper.updateHeaderSet(ObexHelper.java:216)
at javax.obex.ClientSession.sendRequest(ClientSession.java:568)
at javax.obex.ClientSession.connect(ClientSession.java:148)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
   connect(BluetoothOppObexClientSession.java:317)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
   run(BluetoothOppObexClientSession.java:231)
am_crash( 1402): [22527,0,com.android.bluetooth,818462277,java.lang.
   NegativeArraySizeException,-3,ObexHelper.java,216]

Fix:
Add length check before allocate memory and break loop if length is less than
expected header length as per OBEX Specification  to prevent crash.

Test: Verified that OPP Tx and Rx works successfully multiple times.

Bug: 35588578
Change-Id: I805e6b1d51f69645d5132c3c18db2e752d04b096

commit | commitdiff | tree

Jakub Pawlowski [Wed, 1 Nov 2017 22:27:17 +0000 (15:27 -0700)]

Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)

Bug: 68359837
Test: compile
Change-Id: I3cec0b5b20dde33be09a5bbc451cd79273c67961

commit | commitdiff | tree

Jakub Pawlowski [Wed, 1 Nov 2017 17:12:36 +0000 (10:12 -0700)]

Add IBluetoothSocketManager (3/3)

Add IBluetoothSocketManager native Binder implementation. Thanks to it
we'll skip jni to native calls, and need to re-serialize data manually.

Bug: 68359837
Test: none
Change-Id: I6c99717aa18ab41addf96b7536e483ae12802601

commit | commitdiff | tree

Jordan Liu [Thu, 9 Nov 2017 18:51:30 +0000 (18:51 +0000)]

Merge "Add config to use a display rule that ServiceState was considered"
am: bbaa19cad3

Change-Id: I7adbdcdcefaf86e9cf6775aa23aac2618149cf92

commit | commitdiff | tree

Jordan Liu [Thu, 9 Nov 2017 18:24:16 +0000 (18:24 +0000)]

Merge "Add config to use a display rule that ServiceState was considered"

commit | commitdiff | tree

yinxu [Thu, 9 Nov 2017 00:10:16 +0000 (16:10 -0800)]

Fix the comments of onError() callback

Bug: 63718613
Test: Basic telephony sanity
Change-Id: Ibb4bf5fd907666d72c40bb0caf505e187937467b

commit | commitdiff | tree

Hugo Benichi [Thu, 9 Nov 2017 12:34:40 +0000 (12:34 +0000)]

Merge "MacAddress follow-up: define the core of the class"
am: cd35c65b5b

Change-Id: Ic86df7e56a63d3f84ccaebefa904c7625105c581

commit | commitdiff | tree

Hugo Benichi [Thu, 9 Nov 2017 12:22:17 +0000 (12:22 +0000)]

Merge "MacAddress follow-up: define the core of the class"

commit | commitdiff | tree

Hugo Benichi [Wed, 8 Nov 2017 15:22:25 +0000 (00:22 +0900)]

MacAddress follow-up: define the core of the class

Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583

commit | commitdiff | tree

Andreas Gampe [Thu, 9 Nov 2017 03:32:07 +0000 (03:32 +0000)]

Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
am: 08efd36872

Change-Id: I97b6bbce9a969f06b923bebd60ccf9a5dee91e9e

commit | commitdiff | tree

Treehugger Robot [Thu, 9 Nov 2017 03:21:27 +0000 (03:21 +0000)]

Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""

commit | commitdiff | tree

Brad Ebinger [Wed, 8 Nov 2017 23:04:09 +0000 (23:04 +0000)]

Merge "Remove ImsService Feature Interfaces"
am: abfdf0e03d

Change-Id: Ie142d4673c2a3930b3e7c3bcba617e5e26c8fb9c

commit | commitdiff | tree

Brad Ebinger [Wed, 8 Nov 2017 22:54:33 +0000 (22:54 +0000)]

Merge "Remove ImsService Feature Interfaces"