OSDN Git Service

android-x86/frameworks-base.git
6 years agoDisplay "No service" on status bar when SIM unready
Wenting Xiong [Thu, 13 Oct 2016 09:38:16 +0000 (17:38 +0800)]
Display "No service" on status bar when SIM unready

Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.

Test: manual - checked displaying "No service" on status bar
Bug: 29191964
Merged-In: I744ec9a3c70376199ba94d68331604276ea761c3
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3

6 years agoMerge "Add some useful helpers and constants."
Chalard Jean [Fri, 6 Oct 2017 09:48:32 +0000 (09:48 +0000)]
Merge "Add some useful helpers and constants."
am: ed8d236319

Change-Id: I3a934e19ece91bf5957e4c5fa289bbc1a6242915

6 years agoMerge "Add some useful helpers and constants."
Chalard Jean [Fri, 6 Oct 2017 09:37:38 +0000 (09:37 +0000)]
Merge "Add some useful helpers and constants."

6 years agoMerge "Log NAT update descriptions when receiving netlink errors"
Erik Kline [Fri, 6 Oct 2017 09:25:29 +0000 (09:25 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors"
am: 3506aaf992

Change-Id: I3a37cf51b0763e42752d35fc26f70c63d3707fae

6 years agoMerge "Log NAT update descriptions when receiving netlink errors"
Treehugger Robot [Fri, 6 Oct 2017 09:16:18 +0000 (09:16 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors"

6 years agoLog NAT update descriptions when receiving netlink errors
Erik Kline [Fri, 6 Oct 2017 03:56:55 +0000 (12:56 +0900)]
Log NAT update descriptions when receiving netlink errors

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - new logging messages observed

    2017-10-06T13:15:25.190 - [OffloadController] ERROR Error updating NAT conntrack entry >TCP (192.168.43.222, 58054) -> (198.35.26.112, 443)<: android.system.ErrnoException: NetlinkErrorMessage{...
Bug: 29337859
Bug: 32163131
Bug: 64976634
Bug: 67396342

Merged-In: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34
Merged-In: I426b0a0545d56aba7924c416799b37731e7e4b18
Change-Id: Ie05d4e6588d75f8a9798f40b68a317e24b3b5050
(cherry picked from commit a5ae9056e74a13d394c4bb6c36f9255214ffb68b)

6 years agoAdd some useful helpers and constants.
Chalard Jean [Wed, 4 Oct 2017 05:51:42 +0000 (14:51 +0900)]
Add some useful helpers and constants.

Test: Pulled out of a client app ; the client app is behaving
Test: identically to how it was behaving before. Wrote unit
Test: tests in frameworks-net.

Change-Id: I397137748a95c65cee2e1e1b243a1a260e83a6f7

6 years agoMerge "Fix NPE when removing PIN locked SIM during E911 call"
Brad Ebinger [Fri, 6 Oct 2017 03:54:29 +0000 (03:54 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"
am: b7dc3a3b21

Change-Id: I16555b53bbf9c743921cbd36578af3550705a242

6 years agoMerge "Fix NPE when removing PIN locked SIM during E911 call"
Treehugger Robot [Fri, 6 Oct 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"

6 years agoMerge "Display "No service" on status bar when SIM unready"
Jordan Liu [Fri, 6 Oct 2017 03:25:25 +0000 (03:25 +0000)]
Merge "Display "No service" on status bar when SIM unready"
am: a666dbb628  -s ours

Change-Id: I7f0987c397206fcd3becf16e5d867bf57d2fc528

6 years agoMerge "Display "No service" on status bar when SIM unready"
Jordan Liu [Thu, 5 Oct 2017 23:30:45 +0000 (23:30 +0000)]
Merge "Display "No service" on status bar when SIM unready"

6 years agoMerge "Fix documentation generation with OpenJDK 9 javadoc."
Tobias Thierer [Thu, 5 Oct 2017 23:12:37 +0000 (23:12 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."
am: ed6ae8f2b1

Change-Id: I8bd1f9b3994f480d55d7c885b2c24227a67915e9

6 years agoMerge "Fix documentation generation with OpenJDK 9 javadoc."
Tobias Thierer [Thu, 5 Oct 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."

6 years agoFix NPE when removing PIN locked SIM during E911 call
Brad Ebinger [Thu, 5 Oct 2017 18:39:06 +0000 (11:39 -0700)]
Fix NPE when removing PIN locked SIM during E911 call

There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.

Bug: 66986066
Test: Manual, PIN/PUK locked SIM
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3

6 years agoMerge "NativeActivity: Improve error message reporting"
dimitry [Thu, 5 Oct 2017 09:53:27 +0000 (09:53 +0000)]
Merge "NativeActivity: Improve error message reporting"
am: de3150db1e

Change-Id: Icdce5b900d87e136a398f6c68c4706b53dcdcec0

6 years agoMerge "NativeActivity: Improve error message reporting"
Treehugger Robot [Thu, 5 Oct 2017 09:44:21 +0000 (09:44 +0000)]
Merge "NativeActivity: Improve error message reporting"

6 years agoMerge "Cosmetic Cleanups for IpSecService"
nharold [Thu, 5 Oct 2017 00:44:37 +0000 (00:44 +0000)]
Merge "Cosmetic Cleanups for IpSecService"
am: 5ade9a228d

Change-Id: If47968dbd55f8f38f9e8dda4d78a0e2e41827da8

6 years agoMerge "Cosmetic Cleanups for IpSecService"
nharold [Thu, 5 Oct 2017 00:14:16 +0000 (00:14 +0000)]
Merge "Cosmetic Cleanups for IpSecService"

6 years agoMerge changes from topic "ipsec-svc-cleanup"
nharold [Wed, 4 Oct 2017 20:24:10 +0000 (20:24 +0000)]
Merge changes from topic "ipsec-svc-cleanup"
am: 9778c7884f

Change-Id: Ide81ae76bd05ba3a2cc7c06c072306d30a489057

6 years agoCosmetic Cleanups for IpSecService
Nathan Harold [Wed, 4 Oct 2017 19:58:55 +0000 (12:58 -0700)]
Cosmetic Cleanups for IpSecService

This is a follow-up CL to address comments
on aosp/466677
-Rename ManagedResourceArray.get()
-Comment cleanup

Bug: 38397094
Test: runtest frameworks-net
Change-Id: I6fbdd89c4a864fe1d8a19c68947f582d7b1f0f21

6 years agoMerge changes from topic "ipsec-svc-cleanup"
nharold [Wed, 4 Oct 2017 20:00:52 +0000 (20:00 +0000)]
Merge changes from topic "ipsec-svc-cleanup"

* changes:
  Split IpSecServiceTest to add IPv6 Tests
  Add equals() for IpSecAlgorithm and IpSecConfig
  Input Validation for IpSecService

6 years agoNativeActivity: Improve error message reporting
dimitry [Wed, 4 Oct 2017 17:44:56 +0000 (19:44 +0200)]
NativeActivity: Improve error message reporting

The error message is not necessary a dlerror(). For the devices with
native bridge it is reported by NB implementation.

Bug: http://b/67412560
Test: manual
Change-Id: I05377c3490199c40419831b5aae27cb30d4a321b

6 years agoMerge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
Jack He [Wed, 4 Oct 2017 17:22:28 +0000 (17:22 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
am: cfe51aabd2

Change-Id: I6e2337a0b0f4722b82a91c53c340618b9277f3f6

6 years agoMerge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"
Treehugger Robot [Wed, 4 Oct 2017 17:01:00 +0000 (17:01 +0000)]
Merge "PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent"

6 years agoPBAP: Use ACTION_CONNECTION_STATE_CHANGED intent
Jack He [Tue, 3 Oct 2017 02:08:30 +0000 (19:08 -0700)]
PBAP: Use ACTION_CONNECTION_STATE_CHANGED intent

* Use ACTION_CONNECTION_STATE_CHANGED to broadcast connection state
  change to comply with BluetoothProfile interface requirement
* Use BluetoothProfile.STATE_* variables to represent connection
  states for PBAP profile

Bug: 63873163
Test: Connect to car kits
Change-Id: I7dfcfc1b3a3e4868ea5e313f62ad5e504d58b9c2

6 years agoMerge "New function signature for setResolverConfiguration"
Ben Schwartz [Wed, 4 Oct 2017 12:54:14 +0000 (12:54 +0000)]
Merge "New function signature for setResolverConfiguration"
am: 8052930f4f

Change-Id: I1a2efbabc765dd1ff66316332cd69b221deff83b

6 years agoMerge "New function signature for setResolverConfiguration"
Treehugger Robot [Wed, 4 Oct 2017 12:39:09 +0000 (12:39 +0000)]
Merge "New function signature for setResolverConfiguration"

6 years agoMerge "Revert work around clang-tidy segmentation fault."
Chih-hung Hsieh [Wed, 4 Oct 2017 06:38:31 +0000 (06:38 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
am: a47e513464

Change-Id: Ie04d0d16a05c35a865776571f95078e63bc1bf47

6 years agoMerge "Revert work around clang-tidy segmentation fault."
Chih-hung Hsieh [Wed, 4 Oct 2017 06:26:42 +0000 (06:26 +0000)]
Merge "Revert work around clang-tidy segmentation fault."

6 years agoMerge "Convert java hwbinder mk -> bp."
Steven Moreland [Wed, 4 Oct 2017 04:11:38 +0000 (04:11 +0000)]
Merge "Convert java hwbinder mk -> bp."
am: 53c945fb71

Change-Id: Ia1bde2b32e824f160dd4e768531b6b48179f7ba5

6 years agoMerge "Convert java hwbinder mk -> bp."
Treehugger Robot [Wed, 4 Oct 2017 04:00:03 +0000 (04:00 +0000)]
Merge "Convert java hwbinder mk -> bp."

6 years agoConvert java hwbinder mk -> bp.
Steven Moreland [Mon, 2 Oct 2017 23:58:41 +0000 (16:58 -0700)]
Convert java hwbinder mk -> bp.

This library is used to avoid a circular dependency
between frameworks.jar and HIDL hal definition libs.
It is not installed on the device.

Bug: 33420795
Test: m -j hwbinder and things it depends on
Change-Id: I44cc670383f80275026ea892151524599b713087

6 years agoRevert work around clang-tidy segmentation fault.
Chih-Hung Hsieh [Wed, 4 Oct 2017 03:14:21 +0000 (20:14 -0700)]
Revert work around clang-tidy segmentation fault.

Bug: 34740546
Test: build with WITH_TIDY=1 and
WITH_TIDY_CHECKS="*,-readability-*,-google-readability-*,-google-runtime-references"

Change-Id: If99c75cab6a2bec0c6b38aa17189668b4943478d

6 years agoSplit IpSecServiceTest to add IPv6 Tests
Nathan Harold [Tue, 26 Sep 2017 18:44:23 +0000 (11:44 -0700)]
Split IpSecServiceTest to add IPv6 Tests

-Split IpSecServiceTest into parameterized
 and single tests.
-Add IPv6 parameters

Bug: 66954381
Test: this
Change-Id: Ib98c112560014f73bccc3d2842c31d297c7a07ef

6 years agoAdd equals() for IpSecAlgorithm and IpSecConfig
Nathan Harold [Tue, 26 Sep 2017 02:33:13 +0000 (19:33 -0700)]
Add equals() for IpSecAlgorithm and IpSecConfig

Add equality testing methods to support tests
for parceling and un-parceling IpSecConfig.

Bug: 38397094
Test: runtest -x IpSecConfigTest.java
Change-Id: I31e318334d39ed6e9daf5ec8f3be7dcec75e12ad

6 years agoInput Validation for IpSecService
Nathan Harold [Wed, 23 Aug 2017 20:46:33 +0000 (13:46 -0700)]
Input Validation for IpSecService

All of the input to IpSecService over the Binder
interface needs to be validated both for sanity
and for safety.

-Sanity check all the parameters coming from binder.
-Added setters for IpSecConfig to decouple the test
 from the IpSecManager. This was needed because the
 input validation caused the tests to fail due to a
 null parameter that was previously un-tested.
-Added the mode flag to the IpSecConfig bundle this
 oversight was found during testing.
-Expose the getResourceId() methods for testing in
 UdpEncapsulationSocket, SecurityParameterIndex, and
 IpSecTransform classes.
-Remove the unneeded getIpSecConfig() from
 IpSecTransform: unneeded now that we can synthesize
 configs.

Bug: 38397094
Test: runtest frameworks-net
Change-Id: I5241fc7fbfa9816d54219acd8d81a9f7eef10dd4

6 years agoMerge "Collapse Notification panel after tapping CLEAR ALL button"
Selim Cinek [Tue, 3 Oct 2017 21:30:14 +0000 (21:30 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"
am: ca8b270063

Change-Id: I3ce745ab3546fa93aa0cafa7874b8449e6d2cfc9

6 years agoMerge "fix AmrInputStream.read() hang"
Wonsik Kim [Tue, 3 Oct 2017 21:18:10 +0000 (21:18 +0000)]
Merge "fix AmrInputStream.read() hang"
am: 5b6a02eb8b

Change-Id: I7aff9043ec95d2f41e5d3301b01707f5dff4bef2

6 years agoMerge "Collapse Notification panel after tapping CLEAR ALL button"
Selim Cinek [Tue, 3 Oct 2017 21:07:57 +0000 (21:07 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"

6 years agoMerge "Adds a filtering bitmask to DownloadStateCallback"
Brad Ebinger [Tue, 3 Oct 2017 20:55:50 +0000 (20:55 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"
am: 177bd65211

Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e

6 years agoMerge "fix AmrInputStream.read() hang"
Treehugger Robot [Tue, 3 Oct 2017 20:37:36 +0000 (20:37 +0000)]
Merge "fix AmrInputStream.read() hang"

6 years agoMerge "Adds a filtering bitmask to DownloadStateCallback"
Brad Ebinger [Tue, 3 Oct 2017 20:23:00 +0000 (20:23 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"

6 years agoMerge "Remove verification for DownloadReceiver when failure"
Brad Ebinger [Tue, 3 Oct 2017 18:51:32 +0000 (18:51 +0000)]
Merge "Remove verification for DownloadReceiver when failure"
am: f78beae681

Change-Id: I02bc76b2162234c2f063e3dd7f143449a091f012

6 years agoMerge "Decouple Content Name Locale from Content Language Locale"
Brad Ebinger [Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale"
am: a830e83028

Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4

6 years agoMerge "Remove verification for DownloadReceiver when failure"
Brad Ebinger [Tue, 3 Oct 2017 18:32:04 +0000 (18:32 +0000)]
Merge "Remove verification for DownloadReceiver when failure"

6 years agoMerge "Decouple Content Name Locale from Content Language Locale"
Brad Ebinger [Tue, 3 Oct 2017 18:31:49 +0000 (18:31 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale"

6 years agoAdds a filtering bitmask to DownloadStateCallback
Brad Ebinger [Fri, 29 Sep 2017 22:12:08 +0000 (15:12 -0700)]
Adds a filtering bitmask to DownloadStateCallback

Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.

Test: Testapps
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb

6 years agoDisplay "No service" on status bar when SIM unready
Wenting Xiong [Thu, 13 Oct 2016 09:38:16 +0000 (17:38 +0800)]
Display "No service" on status bar when SIM unready

Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.

Test: manual - checked displaying "No service" on status bar
Bug: 29191964
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3

6 years agoFix documentation generation with OpenJDK 9 javadoc.
Tobias Thierer [Tue, 3 Oct 2017 11:15:02 +0000 (12:15 +0100)]
Fix documentation generation with OpenJDK 9 javadoc.

"make docs" breaks ("lint: @attr must be a field") on three @attr ref
statements in LinearLayoutManager. These are the only @attr ref
statements that reference the support library's resources from
framework (the others are within framework or within the support
library); it may be that the R class that they're referencing is
merely in the wrong package, but changing it to com.android.internal.R
or android.R didn't fix the issue.

Since LinearLayoutManager is an internal class, it's not worth the
effort of trying to make this work. This CL drops the three offending
@attr ref statements, thereby fixing the build.

Bug: 62049770
Test: Treehugger

Change-Id: Ife01201019f4fffd5552da11591661539ca40fdd

6 years agoMerge "Update dalvik.bytecode package"
Orion Hodson [Tue, 3 Oct 2017 08:06:57 +0000 (08:06 +0000)]
Merge "Update dalvik.bytecode package"
am: 537d63fe1a

Change-Id: I41ed71812f67136cbf456bfbdbc5b3a245c93f18

6 years agoMerge "Update dalvik.bytecode package"
Orion Hodson [Tue, 3 Oct 2017 07:57:14 +0000 (07:57 +0000)]
Merge "Update dalvik.bytecode package"

6 years agoMerge "Replace strcpy with memcpy."
Yunlian Jiang [Tue, 3 Oct 2017 04:20:17 +0000 (04:20 +0000)]
Merge "Replace strcpy with memcpy."
am: bb115bac41

Change-Id: I28c118a609d999fe1ef6bd126557e63076f452c6

6 years agoMerge "Replace strcpy with memcpy."
Treehugger Robot [Tue, 3 Oct 2017 04:09:48 +0000 (04:09 +0000)]
Merge "Replace strcpy with memcpy."

6 years agoCollapse Notification panel after tapping CLEAR ALL button
Reifu Sato [Thu, 28 Sep 2017 06:10:09 +0000 (15:10 +0900)]
Collapse Notification panel after tapping CLEAR ALL button

Usually, notification panel is automatically collapsed
after tapping "CLEAR ALL" button but is not collapsed
if all dismissable notifications are scrolled out.

In this case, dismissed notification is still displayed
until notification panel is once collapsed.
And that "dismissed" notification causes several issues.

To avoid this, collapse notification panel automatically
after tapping "CLEAR ALL" button even when all dismissable
notifications are scrolled out.

Fixes: 67246876
Test: manual - post ongoing and dismissable notifications,
               and tap CLEAR ALL button.

Change-Id: I048255cde6fdb4cedd2c3472e345ff63c744af68

6 years agoMerge "Delete jack support"
Colin Cross [Tue, 3 Oct 2017 01:31:05 +0000 (01:31 +0000)]
Merge "Delete jack support"
am: 1704df64ce  -s ours

Change-Id: I185bb57219e86d9ef41ebcf5e3f03daaf4946529

6 years agoMerge "Delete jack support"
Treehugger Robot [Tue, 3 Oct 2017 01:17:25 +0000 (01:17 +0000)]
Merge "Delete jack support"

6 years agofix AmrInputStream.read() hang
Wonsik Kim [Mon, 2 Oct 2017 23:16:34 +0000 (16:16 -0700)]
fix AmrInputStream.read() hang

Test: AmrInputStream.read() no longer hangs
Change-Id: I5b3e1c7667891ce250e447c32213511077c5b5df

6 years agoMerge "Add moveObject method to change object's path and parent."
Jerry Zhang [Tue, 3 Oct 2017 00:04:03 +0000 (00:04 +0000)]
Merge "Add moveObject method to change object's path and parent."
am: 33a200e572

Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d

6 years agoMerge "Add moveObject method to change object's path and parent."
Treehugger Robot [Mon, 2 Oct 2017 23:53:56 +0000 (23:53 +0000)]
Merge "Add moveObject method to change object's path and parent."

6 years agoNew function signature for setResolverConfiguration
Ben Schwartz [Mon, 2 Oct 2017 17:08:06 +0000 (13:08 -0400)]
New function signature for setResolverConfiguration

Bug: 64753847
Test: Tests pass.  Normal web browsing works normally.
Change-Id: I2dc2b6ef1c82d9b408501fa73be9c7d0f8672d06

6 years agoAdd moveObject method to change object's path and parent.
Jerry Zhang [Wed, 27 Sep 2017 00:49:52 +0000 (17:49 -0700)]
Add moveObject method to change object's path and parent.

This is needed to implement the MTP MOVE_OBJECT operation.

Bug: 66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f

6 years agoDelete jack support
Colin Cross [Wed, 27 Sep 2017 21:43:27 +0000 (14:43 -0700)]
Delete jack support

Remove references to jack makefiles that no longer exist.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I9fbee7db0167300edf59a85badeff87b4b25f846
Merged-In: I9fbee7db0167300edf59a85badeff87b4b25f846
(cherry picked from commit c6fbe4ef07faaee070f96c380682c5392386be6a)

6 years agoDelete jack support
Colin Cross [Wed, 27 Sep 2017 21:43:27 +0000 (14:43 -0700)]
Delete jack support

Remove references to jack makefiles that no longer exist.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I9fbee7db0167300edf59a85badeff87b4b25f846
Merged-In: I9fbee7db0167300edf59a85badeff87b4b25f846
(cherry picked from commit c6fbe4ef07faaee070f96c380682c5392386be6a)

6 years agoMerge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
Hugo Benichi [Mon, 2 Oct 2017 10:36:22 +0000 (10:36 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
am: 1211941aa0

Change-Id: I169e1d48bffab3326dd61011b7747c1400b9bc74

6 years agoMerge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"
Treehugger Robot [Mon, 2 Oct 2017 10:24:48 +0000 (10:24 +0000)]
Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum"

6 years agoConnectivityServiceTest: fix flaky testNetworkRequestMaximum
Hugo Benichi [Fri, 29 Sep 2017 00:34:08 +0000 (09:34 +0900)]
ConnectivityServiceTest: fix flaky testNetworkRequestMaximum

Registered requests are not keyed by PendingIntents in
ConnectivityService, which means that unregistering a request with a
PendingIntent causes a linear search in all registered requests.

testNetworkRequestMaximum was registering too many PendingIntents
simultaneously, causing the unregistration loop to have n^2
complexity and to take a long time to take effect.

To make the unregistering loop less likely to trigger a timeout on
waitForIdle, this patch changes the test to not register MAX_REQUEST
number of PendingIntent, but instead mixes a small number of
PendingIntents with NetworkCallbacks to reach MAX_REQUEST number of
simultaneously registered requests.

When unregistering these requests, callbacks are unregistered first.

Bug: 32561414
Test: runtest frameworks-net
Change-Id: I48b882c884abe20b388190b7f28baee293446f37

6 years agoMerge "Bluetooth HID Device: Fix a typo"
Hansong Zhang [Sat, 30 Sep 2017 04:48:28 +0000 (04:48 +0000)]
Merge "Bluetooth HID Device: Fix a typo"
am: d30e47ecfc

Change-Id: Ibd3c731781359861d89a7f396ead2f9a7b377821

6 years agoMerge "Bluetooth HID Device: Fix a typo"
Hansong Zhang [Sat, 30 Sep 2017 04:35:54 +0000 (04:35 +0000)]
Merge "Bluetooth HID Device: Fix a typo"

6 years agoDecouple Content Name Locale from Content Language Locale
Brad Ebinger [Fri, 29 Sep 2017 01:00:46 +0000 (18:00 -0700)]
Decouple Content Name Locale from Content Language Locale

There was an assumption that content language Locale was
a 1:1 mapping with content locale name, which is not the
case. This change separates the two and provides a new
API for retreiving the set of Locales for content name.

Test: Manual
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7

6 years agoBluetooth HID Device: Fix a typo
Hansong Zhang [Wed, 27 Sep 2017 23:59:01 +0000 (16:59 -0700)]
Bluetooth HID Device: Fix a typo

Fixed a typo in BluetoothInputHost. "DIGITIZER_TABLED" should be
"DIGITIZER_TABLET".

Test: Not needed.
Change-Id: I06ffc536f5912d53319b4d325f77991d65ab04f2

6 years agoMerge "AmrInputStream is not a public API"
Marco Nelissen [Fri, 29 Sep 2017 20:04:54 +0000 (20:04 +0000)]
Merge "AmrInputStream is not a public API"
am: c3b1442d52

Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb

6 years agoMerge "AmrInputStream is not a public API"
Treehugger Robot [Fri, 29 Sep 2017 19:50:37 +0000 (19:50 +0000)]
Merge "AmrInputStream is not a public API"

6 years agoRemove verification for DownloadReceiver when failure
Brad Ebinger [Fri, 29 Sep 2017 18:04:05 +0000 (11:04 -0700)]
Remove verification for DownloadReceiver when failure

When the ACTION_DOWNLOAD_RESULT_INTERNAL intent is received
with a failure result, don't require that extras exist
in the receiver.

Test: Manual, Testapps
Change-Id: I9ac43a33aff88755cbc804890ce230743195f44d

6 years agoAmrInputStream is not a public API
Marco Nelissen [Fri, 29 Sep 2017 17:15:34 +0000 (10:15 -0700)]
AmrInputStream is not a public API

and nobody should be using it. Add some warnings to that effect.

Change-Id: I8029ccd665fd147b4708a68f61c6aa055004a5c1

6 years agoMerge "Change BlockingSocketReader to use MessageQueue fd handling"
Erik Kline [Fri, 29 Sep 2017 02:41:34 +0000 (02:41 +0000)]
Merge "Change BlockingSocketReader to use MessageQueue fd handling"
am: 48c7d27f64

Change-Id: Ie2ad48132d68d3682e99a4626472c5780457e4a3

6 years agoMerge "Change BlockingSocketReader to use MessageQueue fd handling"
Treehugger Robot [Fri, 29 Sep 2017 02:12:32 +0000 (02:12 +0000)]
Merge "Change BlockingSocketReader to use MessageQueue fd handling"

6 years agoMerge "Add frameworks base config and move text blobs there"
Mathieu Chartier [Fri, 29 Sep 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Add frameworks base config and move text blobs there"
am: 34cf8b2c04

Change-Id: Id96e4b6a3272f2f320b898c42e4970e4bbb2adb9

6 years agoMerge "Add frameworks base config and move text blobs there"
Mathieu Chartier [Thu, 28 Sep 2017 23:43:46 +0000 (23:43 +0000)]
Merge "Add frameworks base config and move text blobs there"

6 years agoMerge "VintfRuntimeInfo: do not fetch files that are not needed"
Yifan Hong [Thu, 28 Sep 2017 23:41:22 +0000 (23:41 +0000)]
Merge "VintfRuntimeInfo: do not fetch files that are not needed"
am: 3e3e26305a

Change-Id: Idc4bc3285aaeb909db8e46cd30958a5c8acb114f

6 years agoMerge "Rename libz-host -> libz"
Dan Willemsen [Thu, 28 Sep 2017 22:56:49 +0000 (22:56 +0000)]
Merge "Rename libz-host -> libz"
am: 3e47510e0e

Change-Id: Iff30621eddc356394617efcc8ced9dc4c9e85e8d

6 years agoMerge "VintfRuntimeInfo: do not fetch files that are not needed"
Treehugger Robot [Thu, 28 Sep 2017 22:11:43 +0000 (22:11 +0000)]
Merge "VintfRuntimeInfo: do not fetch files that are not needed"

6 years agoAdd frameworks base config and move text blobs there
Mathieu Chartier [Fri, 11 Aug 2017 21:35:46 +0000 (14:35 -0700)]
Add frameworks base config and move text blobs there

Bug: 64259751
Test: clean oat files && make and flash

(cherry picked from commit a023b86c3b4554b90ed6edfd63cedddb4f0100f9)

Merged-In: I7c898d69e66257fe0a7827ebbab1fcff4aa6473e
Change-Id: Ifb40ec51e7184984853c0d2382f040d2dea63168

6 years agoMerge "Frameworks: Move Log holder to be preloaded"
Andreas Gampe [Thu, 28 Sep 2017 21:21:33 +0000 (21:21 +0000)]
Merge "Frameworks: Move Log holder to be preloaded"
am: 7dd3a7d5c0

Change-Id: Ief51fd7b8cdf14c22ded48fde7121d6cca8f243e

6 years agoMerge "Rename libz-host -> libz"
Dan Willemsen [Thu, 28 Sep 2017 20:57:43 +0000 (20:57 +0000)]
Merge "Rename libz-host -> libz"

6 years agoMerge "Frameworks: Move Log holder to be preloaded"
Treehugger Robot [Thu, 28 Sep 2017 20:57:35 +0000 (20:57 +0000)]
Merge "Frameworks: Move Log holder to be preloaded"

6 years agoMerge "Don't cancel by UID when an app is disabled or uninstalled"
Makoto Onuki [Thu, 28 Sep 2017 16:36:15 +0000 (16:36 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled"
am: 36d606c86d

Change-Id: Ib0a9eb74f7b31a644472631c10d3a0f1604d8033

6 years agoMerge "Don't cancel by UID when an app is disabled or uninstalled"
Makoto Onuki [Thu, 28 Sep 2017 16:19:05 +0000 (16:19 +0000)]
Merge "Don't cancel by UID when an app is disabled or uninstalled"

6 years agoFrameworks: Move Log holder to be preloaded
Andreas Gampe [Wed, 27 Sep 2017 18:57:27 +0000 (11:57 -0700)]
Frameworks: Move Log holder to be preloaded

To avoid issues with late initialization, let the holder be
initialized in the zygote.

(cherry picked from commit 61a3e8c23a7c62c389433113802a0d74f4ab53cf)

Bug: 65927416
Test: m
Merged-In: I6f454df46d4c64d295e1f2510793d5087b74fb74
Change-Id: I6f454df46d4c64d295e1f2510793d5087b74fb74

6 years agoMerge "Fix NPE in NsdServiceTest"
Hugo Benichi [Thu, 28 Sep 2017 12:22:34 +0000 (12:22 +0000)]
Merge "Fix NPE in NsdServiceTest"
am: 60d5390f7a

Change-Id: Ic9b7aaec14066d18247cc1efbdc06be1e6a79f29

6 years agoMerge "Fix NPE in NsdServiceTest"
Hugo Benichi [Thu, 28 Sep 2017 12:13:18 +0000 (12:13 +0000)]
Merge "Fix NPE in NsdServiceTest"

6 years agoChange BlockingSocketReader to use MessageQueue fd handling
Erik Kline [Mon, 10 Jul 2017 11:17:30 +0000 (20:17 +0900)]
Change BlockingSocketReader to use MessageQueue fd handling

Convert the simplistic blocking read in a separate thread model to
the MessageQueue OnFileDescriptorEventListener model, albeit still
on a separate thread.

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - basic IpManager functions still work,
      including ConnectivityPacketTracker
Bug: 62476366
Bug: 67013397
Change-Id: I1f4a6707eba402338947fe3f5392a26660f05714

6 years agoMerge "Do not throw on call to isTetheringSupported w/o permission"
Jean Chalard [Thu, 28 Sep 2017 07:47:30 +0000 (07:47 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission"
am: 6201cc6f27

Change-Id: Ie2ed67525e719104cef1537568f944b77d5f5e4e

6 years agoMerge "Do not throw on call to isTetheringSupported w/o permission"
Jean Chalard [Thu, 28 Sep 2017 07:39:14 +0000 (07:39 +0000)]
Merge "Do not throw on call to isTetheringSupported w/o permission"

6 years agoDo not throw on call to isTetheringSupported w/o permission
Chalard Jean [Tue, 26 Sep 2017 06:45:18 +0000 (15:45 +0900)]
Do not throw on call to isTetheringSupported w/o permission

...just return false instead.

Test: Made an app to test this. Made sure it doesn't have
Test: the required permission. Checked it crashes with
Test: SecurityException without this change. Checked that it
Test: doesn't with it.

Merged-In: Ib5b17a7f68c1327f47fe1f54c0454c51f4226907
Change-Id: Id20d3c240ec5d70d085e0366b92ab3a514f3e7c8
(cherry picked from commit 8f76fc38ec1682667de2caf3940fbfb71744d368)

6 years agoFix NPE in NsdServiceTest
Hugo Benichi [Tue, 26 Sep 2017 05:51:11 +0000 (14:51 +0900)]
Fix NPE in NsdServiceTest

Continuous test dashboards report that quit() can crash sometimes
due to mThread being null.

This patch adds a null guard in tearDown().

Bug: 32561414
Test: runtest frameworks-net
Change-Id: If66fb47e31e77d25b4741a786f12eb78f0b9102e

6 years agoRename libz-host -> libz
Dan Willemsen [Wed, 27 Sep 2017 23:20:31 +0000 (16:20 -0700)]
Rename libz-host -> libz

Test: m host
Change-Id: I2806dde519602bc31b622ae3b3f55ab8b1287744

6 years agoVintfRuntimeInfo: do not fetch files that are not needed
Yifan Hong [Tue, 26 Sep 2017 22:07:34 +0000 (15:07 -0700)]
VintfRuntimeInfo: do not fetch files that are not needed

... to avoid unnecessary denials.

Test: CtsDeviceInfo
Bug: 66960848
Change-Id: I28821c44285a7de424a79b8a374feac6718605b1

6 years agoMerge "Modify Bluetooth Class of Device from Android stack"
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:04:32 +0000 (20:04 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
am: f4ec2ab706

Change-Id: I9a0b06f44d2fe7be343fc38ce240d82f1b309d7d

6 years agoMerge "Modify Bluetooth Class of Device from Android stack"
Treehugger Robot [Wed, 27 Sep 2017 19:43:17 +0000 (19:43 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"

6 years agoUpdate dalvik.bytecode package
Orion Hodson [Fri, 22 Sep 2017 09:04:56 +0000 (10:04 +0100)]
Update dalvik.bytecode package

BUG: 66562179
Test: m checkapi
Change-Id: Ifeecbecbd7334b55126b6e0f51eb5e8b516e341a