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

(root) / android-x86 / frameworks-base.git / log

Peter Qiu [Tue, 14 Mar 2017 23:07:28 +0000 (23:07 +0000)]

Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
am: 6493f3df6b

Change-Id: I40fc13a08425f2ada7e648342db92d83c4d59cba

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Mar 2017 22:45:56 +0000 (22:45 +0000)]

Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"

commit | commitdiff | tree

Svetoslav Ganov [Tue, 14 Mar 2017 19:07:22 +0000 (19:07 +0000)]

Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"
am: 14c7e67da8

Change-Id: Icfa9fc501806820545dd9df9d671fcdfe645b73f

commit | commitdiff | tree

Svetoslav Ganov [Tue, 14 Mar 2017 18:58:28 +0000 (18:58 +0000)]

Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked"

commit | commitdiff | tree

Peter Qiu [Tue, 14 Mar 2017 16:24:11 +0000 (16:24 +0000)]

Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
am: 5df03b3d74

Change-Id: Ic1822a3203da5522a5a103c34fb45a6498cd6428

commit | commitdiff | tree

Peter Qiu [Tue, 14 Mar 2017 16:22:28 +0000 (16:22 +0000)]

hotspot2: hide validate method for Passpoint configuration
am: b5ca6f36b5

Change-Id: I268b0db6c844ec1746b6374c87768f233b719b3f

commit | commitdiff | tree

Peter Qiu [Tue, 14 Mar 2017 16:21:06 +0000 (16:21 +0000)]

Osu: temporarily comment out the usage of deprecated intent definitions
am: 06b63dcb9f

Change-Id: I6c418dbecc72ac5c4e245fff06fabfe23b443c23

commit | commitdiff | tree

Peter Qiu [Tue, 14 Mar 2017 16:19:19 +0000 (16:19 +0000)]

hotspot2: update Passpoint intent definitions
am: 5679145d9a

Change-Id: I4e59efbcd9a9d33ceac8cc359155770c2de5a0fd

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Mar 2017 16:07:46 +0000 (16:07 +0000)]

Merge changes from topics 'Passpoint API update', 'Passpoint intent update'

* changes:
  hotspot2: update Passpoint configuration management APIs
  hotspot2: hide validate method for Passpoint configuration
  Osu: temporarily comment out the usage of deprecated intent definitions
  hotspot2: update Passpoint intent definitions

commit | commitdiff | tree

Erik Kline [Tue, 14 Mar 2017 06:08:34 +0000 (06:08 +0000)]

Merge "Address some comments on IpManagerTest"
am: b2afa1ede5

Change-Id: Ic986c23c693757b8311e0de0c0a94281db67f62d

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Mar 2017 06:00:34 +0000 (06:00 +0000)]

Merge "Address some comments on IpManagerTest"

commit | commitdiff | tree

Erik Kline [Tue, 14 Mar 2017 04:00:27 +0000 (13:00 +0900)]

Address some comments on IpManagerTest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 26991160
Change-Id: Ib543874188537e31422206d67d1760762a7c85cd

commit | commitdiff | tree

Erik Kline [Tue, 14 Mar 2017 03:11:15 +0000 (03:11 +0000)]

Merge "Skeleton of an IpManagerTest"
am: db4333a2c2

Change-Id: I5817c2458c222afb85389deaf22b43d245577b2a

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Mar 2017 03:02:19 +0000 (03:02 +0000)]

Merge "Skeleton of an IpManagerTest"

commit | commitdiff | tree

Erik Kline [Tue, 14 Mar 2017 01:01:58 +0000 (10:01 +0900)]

Skeleton of an IpManagerTest

Test: as follows
    - biult (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 26991160
Change-Id: Idddddf0c1a7a8d0a8acff8a5526b02a533d5f3ec

commit | commitdiff | tree

fionaxu [Tue, 14 Mar 2017 01:10:51 +0000 (01:10 +0000)]

Merge "carrier default app notification polish"
am: b2bb98e62d

Change-Id: I78101dd7dc4bd7f222c5e6cc095b7179ce03f362

commit | commitdiff | tree

Treehugger Robot [Tue, 14 Mar 2017 00:55:05 +0000 (00:55 +0000)]

Merge "carrier default app notification polish"

commit | commitdiff | tree

fionaxu [Mon, 13 Mar 2017 23:01:12 +0000 (16:01 -0700)]

carrier default app notification polish

change notification string and app name

Bug: 36002256
Test: Manual
Change-Id: Iec2658850522585157bdc7edd7330ac930bf751d

commit | commitdiff | tree

Peter Qiu [Mon, 6 Mar 2017 18:47:55 +0000 (10:47 -0800)]

hotspot2: update Passpoint configuration management APIs

Address API Councils comment to update both
WifiManager#addOrUpdatePasspointConfiguration and
WifiManager#removePasspointConfiguration to return void and throw
exception on failure instead of returning a boolean.

Bug: 35858311,35856174
Test: make -j32
Change-Id: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
Merged-In: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95

commit | commitdiff | tree

Peter Qiu [Fri, 3 Mar 2017 17:15:49 +0000 (09:15 -0800)]

hotspot2: hide validate method for Passpoint configuration

The validate method is used by Framework only, no need to expose
to app developers. So hide it.

Bug: 35756298
Test: make -j32
Change-Id: I15ccae472f30d7ae968816479f6ea35d90248fe0
Merged-In: I15ccae472f30d7ae968816479f6ea35d90248fe0

commit | commitdiff | tree

Peter Qiu [Mon, 13 Mar 2017 18:19:43 +0000 (11:19 -0700)]

Osu: temporarily comment out the usage of deprecated intent definitions

Bug: 35857805
Test: mmma frameworks/base/packages/Osu
Change-Id: Iadaede1806cfe7bcaf57ed185618a6de4451e321
Merged-In: Ie4ea352e11b10a7c1f8780557554486bc2b4fcef

commit | commitdiff | tree

Jakub Pawlowski [Mon, 13 Mar 2017 18:11:58 +0000 (18:11 +0000)]

Merge "Bluetooth 5 spelling fixes"
am: 5465fe0a2d

Change-Id: Ibef8ee6a56bf1f8c695e07e4ba61c015054eee13

commit | commitdiff | tree

Jakub Pawlowski [Mon, 13 Mar 2017 17:58:25 +0000 (17:58 +0000)]

Merge "Bluetooth 5 spelling fixes"

commit | commitdiff | tree

Jakub Pawlowski [Sat, 11 Mar 2017 00:07:59 +0000 (16:07 -0800)]

Bluetooth 5 spelling fixes

Bug: 30622771
Test: manual
Change-Id: I46b6486619cc7366e56b25ca48937e6792f53e1d
(cherry picked from commit 53501ad210dd5c65c7910a6b75b2b481e92dd22f)

commit | commitdiff | tree

Hiroshi Yamauchi [Mon, 13 Mar 2017 17:42:50 +0000 (17:42 +0000)]

Merge "Fix the reset of boosted zygote thread priority."
am: 83aceea07d

Change-Id: I6ebd30a631ae10ada65b3279ec66c41d3f50fb1f

commit | commitdiff | tree

Peter Qiu [Thu, 2 Mar 2017 17:35:34 +0000 (09:35 -0800)]

hotspot2: update Passpoint intent definitions

Address API Councils comment on the newly added intent definitions
for Passpoint events:
- Use a Parcelable class to represent icon info
- Document all extras that are included for an action
- Document that the new intents will only be sent to registered
receivers, and not manifest receivers
- Rename extras to be more generic

While there, removed the deprecated hidden Passpoint intent
definitions.

Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
Merged-In: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5

commit | commitdiff | tree

Hiroshi Yamauchi [Mon, 13 Mar 2017 17:32:30 +0000 (17:32 +0000)]

Merge "Fix the reset of boosted zygote thread priority."

commit | commitdiff | tree

Hiroshi Yamauchi [Thu, 2 Mar 2017 21:39:07 +0000 (13:39 -0800)]

Fix the reset of boosted zygote thread priority.

This fixes the unexpected priority 112 of the daemon threads
(eg. HeapTaskDaemon). The problem was that when the zygote main
thread's priority is reset, it directly calls setpriority() and fails
to update the priority value in java.lang.Thread, which in turn causes
any threads created by the thread to unexpectedly inherit the boosted
priority. Calling java.lang.Thread.setPriority instead fixes.

(cherry picked from commit 1e3db871e52e59c69edb1843df7f4aecb030bc6f)

Bug: 35801778
Bug: 28866384
Test: angler master userdebug boots and thread priorities checked.

Change-Id: I68a6ed7244a9067acc2749feca7f88422bf44b02

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Mar 2017 07:31:54 +0000 (07:31 +0000)]

Merge "Minor formatting cleanup to remove overlong line"
am: d6998d4bd6

Change-Id: I3a4582ebfc1cb7436e570e37cacbc3cabf8c0182

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Mar 2017 07:23:05 +0000 (07:23 +0000)]

Merge "Minor formatting cleanup to remove overlong line"

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Mar 2017 07:09:49 +0000 (07:09 +0000)]

Merge "ConnectivityManager: unhide methods with Handler argument"
am: e940d5458d

Change-Id: I470d68a25e62b9493ac7cfb5887e8345968f1097

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Mar 2017 06:58:29 +0000 (06:58 +0000)]

Merge "ConnectivityManager: unhide methods with Handler argument"

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Mar 2017 00:14:55 +0000 (00:14 +0000)]

Merge "Simple cleanups to Tethering"
am: 7eaa2ad172

Change-Id: I3bb7e4756eaa0b7e702ff7270beb7420b7b6aac5

commit | commitdiff | tree

Hugo Benichi [Mon, 13 Mar 2017 00:03:58 +0000 (00:03 +0000)]

Merge "Simple cleanups to Tethering"

commit | commitdiff | tree

Jeff Vander Stoep [Sat, 11 Mar 2017 23:30:01 +0000 (23:30 +0000)]

Merge "Move mac_permissions to etc/selinux"
am: b063fe384f

Change-Id: Ia6da81ff48e749c8d3f4f150e81fc0c138e7763e

commit | commitdiff | tree

Treehugger Robot [Sat, 11 Mar 2017 23:23:09 +0000 (23:23 +0000)]

Merge "Move mac_permissions to etc/selinux"

commit | commitdiff | tree

Jeff Vander Stoep [Sat, 11 Mar 2017 00:01:19 +0000 (16:01 -0800)]

Move mac_permissions to etc/selinux

Test: Build and boot Marlin
Test: See the following in the logs:
01-01 02:10:28.756 1345 1345 D SELinuxMMAC: Using policy file /system/etc/selinux/plat_mac_permissions.xml
01-01 02:10:28.787 1345 1345 D SELinuxMMAC: Using policy file /vendor/etc/selinux/nonplat_mac_permissions.xml
Bug: 36003167

Change-Id: I97479260eabe14c1b1dcc238d7322016f6b5c4dd

commit | commitdiff | tree

Randy Pan [Fri, 10 Mar 2017 23:08:15 +0000 (23:08 +0000)]

Merge "Add a config for WiFi exponential backoff scan base interval"
am: c25e2b79b1

Change-Id: Ic924e478f1278ab0873f33984d3026a5ec63c91c

commit | commitdiff | tree

Treehugger Robot [Fri, 10 Mar 2017 22:58:52 +0000 (22:58 +0000)]

Merge "Add a config for WiFi exponential backoff scan base interval"

commit | commitdiff | tree

Paul Duffin [Fri, 10 Mar 2017 20:43:07 +0000 (20:43 +0000)]

Merge "Refactor code incompatible with Mockito 2.7.13"
am: 2a3a4f81f9

Change-Id: I259dc2116f1ba7d409729d739404dca501f4a5e8

commit | commitdiff | tree

Paul Duffin [Fri, 10 Mar 2017 20:33:20 +0000 (20:33 +0000)]

Merge "Refactor code incompatible with Mockito 2.7.13"

commit | commitdiff | tree

Randy Pan [Fri, 10 Mar 2017 17:40:39 +0000 (09:40 -0800)]

Add a config for WiFi exponential backoff scan base interval

Bug: 36026947
Test: bulid and boot up the phone
Change-Id: I4971c1c7d0fc162ac5934becbdf28fba50d65c11

commit | commitdiff | tree

Etan Cohen [Fri, 10 Mar 2017 17:13:42 +0000 (17:13 +0000)]

Merge "[AWARE] Update network API: make open/encrypted explicit"
am: 3dee29581e

Change-Id: Ia77ef6835da6497a1641e1fda3e8de67f86b6690

commit | commitdiff | tree

Etan Cohen [Fri, 10 Mar 2017 17:03:20 +0000 (17:03 +0000)]

Merge "[AWARE] Update network API: make open/encrypted explicit"

commit | commitdiff | tree

Paul Duffin [Thu, 9 Mar 2017 18:49:41 +0000 (18:49 +0000)]

Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Merged-In: I96e3da967fad731fc8f39bde9db95f50ab7353fb
Change-Id: I445b32432eea8a1ccb2060a73460a882a9ebe76f

commit | commitdiff | tree

fionaxu [Fri, 10 Mar 2017 09:52:22 +0000 (09:52 +0000)]

Merge "polish the notification of the default carrier app"
am: b224b318a0

Change-Id: I4bb9f08d155def15a79a4960f05650cb5d7615fd

commit | commitdiff | tree

Treehugger Robot [Fri, 10 Mar 2017 09:44:02 +0000 (09:44 +0000)]

Merge "polish the notification of the default carrier app"

commit | commitdiff | tree

fionaxu [Fri, 10 Mar 2017 09:40:59 +0000 (09:40 +0000)]

Merge "decouple carrierdefaultapp from phone process"
am: e32fc81c5d

Change-Id: I3b03e57609ab649f01a45a6b70edca1402f80b3e

commit | commitdiff | tree

Treehugger Robot [Fri, 10 Mar 2017 09:33:08 +0000 (09:33 +0000)]

Merge "decouple carrierdefaultapp from phone process"

commit | commitdiff | tree

fionaxu [Fri, 10 Mar 2017 06:25:29 +0000 (22:25 -0800)]

decouple carrierdefaultapp from phone process

Bug: 36114351
Test: Manual
Change-Id: I679d97bd9854fe478499d1fac6225c3f954ecdbc

commit | commitdiff | tree

Hugo Benichi [Fri, 10 Mar 2017 05:20:57 +0000 (14:20 +0900)]

Simple cleanups to Tethering

- regroup together static final class fields, final instance fields, and
mutable instance fields.
- uses correct Android naming conventions for instance fields.
- reorder imports correctly.

Test: no functional change.
Change-Id: If3d73bc28972a004c2ba3cc14d869a2a679abfce

commit | commitdiff | tree

Brad Ebinger [Thu, 9 Mar 2017 21:46:39 +0000 (21:46 +0000)]

Merge "Disable a phone number log for user build"
am: 59a40691a5

Change-Id: I9b2a14b29fe5e096b734b6e3f1d4b65806753646

commit | commitdiff | tree

Brad Ebinger [Thu, 9 Mar 2017 21:38:59 +0000 (21:38 +0000)]

Merge "Disable a phone number log for user build"

commit | commitdiff | tree

Miao Wang [Thu, 9 Mar 2017 20:51:50 +0000 (20:51 +0000)]

Merge changes from topic 'USAGE_IO_INPUT'
am: 70fac233fa

Change-Id: I3f8db9b25a8ccee8ddb596baf5e54a268747de9f

commit | commitdiff | tree

Miao Wang [Thu, 9 Mar 2017 20:50:38 +0000 (20:50 +0000)]

[RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface.
am: 33287e8a89

Change-Id: Iffd2de04c50f07806063543abe9cd359ce48b6df

commit | commitdiff | tree

Miao Wang [Thu, 9 Mar 2017 20:38:48 +0000 (20:38 +0000)]

Merge changes from topic 'USAGE_IO_INPUT'

* changes:
[RenderScript] Update RenderScript JNI with the corresponding AllocationGetSurface driver implementation change.
[RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface.

commit | commitdiff | tree

Hugo Benichi [Thu, 9 Mar 2017 10:11:55 +0000 (10:11 +0000)]

Merge "CaptivePortalLoginActivity correctly gets UserAgent"
am: 4903487fd9

Change-Id: Iea24e914cab4128464f8866a4b9ae47c7c5325bf

commit | commitdiff | tree

Treehugger Robot [Thu, 9 Mar 2017 10:03:26 +0000 (10:03 +0000)]

Merge "CaptivePortalLoginActivity correctly gets UserAgent"

commit | commitdiff | tree

Martijn Coenen [Thu, 9 Mar 2017 08:39:15 +0000 (08:39 +0000)]

Merge "Remove interfaceChain from IServiceManager::add()"
am: 4a75e32f1d

Change-Id: I9443e22ed730c44abc6fd6f697f8b3f04b667f37

commit | commitdiff | tree

Martijn Coenen [Thu, 9 Mar 2017 08:33:02 +0000 (08:33 +0000)]

Merge "Remove interfaceChain from IServiceManager::add()"

commit | commitdiff | tree

Hugo Benichi [Tue, 7 Mar 2017 06:10:03 +0000 (15:10 +0900)]

CaptivePortalLoginActivity correctly gets UserAgent

Change I33cbcdab9809c712d998da6d925bdd4e3093f8ff added to the intent
passed from NetworkMonitor to the CaptivePortalLoginActivity an extra
argument to set the UserAgent header of probes done by the
CaptivePortalLoginActivity.

However that extra String argument is not correctly retrieved from the
Intent and instead a null pointer is returned by getParcelableExtra().
Consequently the UserAgent header field is never set.

This patch fixes this bug and replace getParcelableExtra() with
getStringExtra().

It also adds logging of the request header and response header for every
network probes sent by CaptivePortalLoginActivity.

Bug: 35937367, 32369183
Test: manually tested
Change-Id: If5c463023474ffb0401f3cda5875ccd9fc6f79f9

commit | commitdiff | tree

Hugo Benichi [Thu, 2 Mar 2017 04:41:38 +0000 (13:41 +0900)]

ConnectivityManager: unhide methods with Handler argument

Test: no functionality change
Bug: 32130437
Change-Id: I2a57175142683f991a215b584282db143a76ed9d

commit | commitdiff | tree

Brad Ebinger [Wed, 8 Mar 2017 20:02:03 +0000 (20:02 +0000)]

Merge "Return generic Binder on onBind"
am: c6613f7206

Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d

commit | commitdiff | tree

Brad Ebinger [Wed, 8 Mar 2017 19:53:25 +0000 (19:53 +0000)]

Merge "Return generic Binder on onBind"

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:21:03 +0000 (19:21 +0000)]

Merge "Bluetooth 5 Advertising API"
am: 1bb08c25b8

Change-Id: Ifd95aacf025929d3c9f5a1762f31ed20c26fabfd

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:18:50 +0000 (19:18 +0000)]

Merge "Bluetooth 5 PHY selection API"
am: 104eeedb42

Change-Id: I0ee2daaf0771b405c8a14598a70459879d31c953

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:14:22 +0000 (19:14 +0000)]

Merge "Bluetooth 5 periodc scan API (1/2)"
am: f1d76a71c8

Change-Id: I7b68746e3dc02a12d13380a90bcf26cebfd31f16

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:12:08 +0000 (19:12 +0000)]

Merge "Bluetooth 5 enhanced scanning API"
am: bed6fb3f5a

Change-Id: I27d61ec7446c36143dcd5a94158451e1be9a5411

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:09:43 +0000 (19:09 +0000)]

Merge "Bluetooth 5 feature check API (1/2)"
am: a06a0dfdb7

Change-Id: I59cf0e8f496e6a1201a3a6ec832c33cd1c8972df

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:05:12 +0000 (19:05 +0000)]

Merge "Bluetooth 5 Advertising API"

commit | commitdiff | tree

Jakub Pawlowski [Tue, 10 Jan 2017 14:15:54 +0000 (06:15 -0800)]

Bluetooth 5 Advertising API

Test: manual
Bug: 30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
(cherry picked from commit 5324a14cf490656269ef862d7f8f6b139a21c0e6)

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:04:30 +0000 (19:04 +0000)]

Merge "Bluetooth 5 PHY selection API"

commit | commitdiff | tree

Jakub Pawlowski [Thu, 2 Feb 2017 16:07:12 +0000 (08:07 -0800)]

Bluetooth 5 PHY selection API

Bug: 30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
(cherry picked from commit db5a87d50db9d4b3d642603f6c329b83ee5851f6)

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:03:47 +0000 (19:03 +0000)]

Merge "Bluetooth 5 periodc scan API (1/2)"

commit | commitdiff | tree

Jakub Pawlowski [Mon, 16 Jan 2017 15:21:01 +0000 (07:21 -0800)]

Bluetooth 5 periodc scan API (1/2)

Bug: 30622771
Test: manual
Change-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c
(cherry picked from commit a48e03745becc96181c676dc3d194d0572f11c10)

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:02:57 +0000 (19:02 +0000)]

Merge "Bluetooth 5 enhanced scanning API"

commit | commitdiff | tree

Jakub Pawlowski [Tue, 17 Jan 2017 15:50:46 +0000 (07:50 -0800)]

Bluetooth 5 enhanced scanning API

Bug: 30622771
Test: manual
Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75
(cherry picked from commit 9de522c6e48497028d36a1f8ad8f8adf4b7b1ae6)

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Mar 2017 19:02:11 +0000 (19:02 +0000)]

Merge "Bluetooth 5 feature check API (1/2)"

commit | commitdiff | tree

Jakub Pawlowski [Wed, 8 Feb 2017 02:05:39 +0000 (18:05 -0800)]

Bluetooth 5 feature check API (1/2)

Bug: 30622771
Test: manual
Change-Id: I90e2efe989745c07c2f2fb8f4ea5bc3b718382f6
(cherry picked from commit 79d66495c32996a5b532328571bf6ceecca70ca5)

commit | commitdiff | tree

Joachim Sauer [Wed, 8 Mar 2017 17:40:13 +0000 (17:40 +0000)]

Merge "Renaming Czech Republic to Czechia."
am: 33bade08de

Change-Id: Ie76ebb1bd53eb4993f0d01c7d3b5ba7dae9c6504

commit | commitdiff | tree

Joachim Sauer [Wed, 8 Mar 2017 17:31:26 +0000 (17:31 +0000)]

Merge "Renaming Czech Republic to Czechia."

commit | commitdiff | tree

Etan Cohen [Wed, 8 Mar 2017 17:05:02 +0000 (09:05 -0800)]

[AWARE] Update network API: make open/encrypted explicit

Replace the older (implicitly) open network with 3 network
creation APIs:
- Open
- Passphrase-based
- PMK (SystemApi only)

Bug: 26564544
Bug: 35702875
Test: unit tests and integration (sl4a) tests
Change-Id: I29a1d668d245853755cd2dfaaa6c65fbb43989f7

commit | commitdiff | tree

Etan Cohen [Wed, 8 Mar 2017 15:05:18 +0000 (15:05 +0000)]

Merge "[AWARE] Add data-path security configuration (Passphrase)"
am: 769fa0c881

Change-Id: If38fa15ce7c6606f081b86dad1ecbe0cac453ed5

commit | commitdiff | tree

Paul Duffin [Wed, 8 Mar 2017 14:59:26 +0000 (14:59 +0000)]

Merge "Replace usages of littlemock with mockito"
am: 0a11c83016

Change-Id: I1456ae3d07d396080a817de01796eefc71230981

commit | commitdiff | tree

Etan Cohen [Wed, 8 Mar 2017 14:55:04 +0000 (14:55 +0000)]

Merge "[AWARE] Add data-path security configuration (Passphrase)"

commit | commitdiff | tree

Paul Duffin [Wed, 8 Mar 2017 14:36:16 +0000 (14:36 +0000)]

Merge "Replace usages of littlemock with mockito"

commit | commitdiff | tree

Etan Cohen [Tue, 21 Feb 2017 18:08:42 +0000 (10:08 -0800)]

[AWARE] Add data-path security configuration (Passphrase)

Add API to optionally provide a passphrase to
configure security on a data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: Ie011345348a3918a412957e38610cabe147c35fa

commit | commitdiff | tree

Hemant Gupta [Wed, 8 Mar 2017 00:38:14 +0000 (00:38 +0000)]

Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"
am: 79eb213a98

Change-Id: I5f82a0c40c64fca0701abba44693b2892209acf3

commit | commitdiff | tree

Treehugger Robot [Wed, 8 Mar 2017 00:28:30 +0000 (00:28 +0000)]

Merge "Bluetooth: Expose L2CAP API to support OPP 1.2"

commit | commitdiff | tree

Hall Liu [Tue, 7 Mar 2017 21:52:52 +0000 (21:52 +0000)]

Merge "Add further Connection-side APIs for RTT (part 2)"
am: 6bb5110f2c

Change-Id: Idfe092393301fb47e6a635eb150103cb928a2696

commit | commitdiff | tree

Hall Liu [Tue, 7 Mar 2017 21:44:42 +0000 (21:44 +0000)]

Merge "Add further Connection-side APIs for RTT (part 2)"

commit | commitdiff | tree

Calin Juravle [Tue, 7 Mar 2017 21:23:03 +0000 (21:23 +0000)]

Merge "PackageManager: Clean up code related to foreign dex use"
am: eef66fd0c7

Change-Id: I443f001c15daddd63a17685c2e82fc9a619c45ee

commit | commitdiff | tree

Calin Juravle [Tue, 7 Mar 2017 21:13:14 +0000 (21:13 +0000)]

Merge "PackageManager: Clean up code related to foreign dex use"

commit | commitdiff | tree

Calin Juravle [Sat, 4 Mar 2017 01:04:55 +0000 (17:04 -0800)]

PackageManager: Clean up code related to foreign dex use

We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.

Test: device boots, foreign dex markers are not created anymore

Bug: 32871170

(cherry picked from commit 74f0a3450cd598f52b2c68c43531b1a27fb4e1ce)

Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950

commit | commitdiff | tree

Andreas Gampe [Tue, 7 Mar 2017 16:59:12 +0000 (16:59 +0000)]

Merge "Framework: Ensure image heap string literals for Patterns"
am: d0f092af84

Change-Id: I69886924b3aca6c050239069c00e166142e2e522

commit | commitdiff | tree

Treehugger Robot [Tue, 7 Mar 2017 16:50:58 +0000 (16:50 +0000)]

Merge "Framework: Ensure image heap string literals for Patterns"

commit | commitdiff | tree

Etan Cohen [Tue, 7 Mar 2017 16:49:53 +0000 (16:49 +0000)]

Merge "[CM] Allow timeout in request network"
am: 8328f27a87

Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0

commit | commitdiff | tree

Tobias Thierer [Tue, 7 Mar 2017 16:43:16 +0000 (16:43 +0000)]

Merge "Track: ICU TimeZone: publish TIMEZONE_* constants"
am: aa4877e295

Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9