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

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

Joachim Sauer [Wed, 15 Mar 2017 12:02:27 +0000 (12:02 +0000)]

Merge "Change Czech Republic to Czechia" am: 027a67062e
am: 14bcec27a0

Change-Id: Ia8b2bcf8d01aaad715f2bd4051fc7dc011735569

commit | commitdiff | tree

Joachim Sauer [Wed, 15 Mar 2017 11:57:28 +0000 (11:57 +0000)]

Merge "Change Czech Republic to Czechia"
am: 027a67062e

Change-Id: I51fc6fde5647b1fd8ecc677da7f6ec7a248a3b38

commit | commitdiff | tree

Treehugger Robot [Wed, 15 Mar 2017 11:45:43 +0000 (11:45 +0000)]

Merge "Change Czech Republic to Czechia"

commit | commitdiff | tree

Erik Kline [Wed, 15 Mar 2017 02:43:19 +0000 (02:43 +0000)]

Merge "Add comment with packet tracker debugging tip" am: 40aa5ee583
am: 17dd8723b7

Change-Id: I1d937d99d58ae031d6bf86f3407669bf47d5c037

commit | commitdiff | tree

Erik Kline [Wed, 15 Mar 2017 02:38:51 +0000 (02:38 +0000)]

Merge "Add comment with packet tracker debugging tip"
am: 40aa5ee583

Change-Id: I0f5f139f81af23ddc33e37ddf489a477e37c394f

commit | commitdiff | tree

Treehugger Robot [Wed, 15 Mar 2017 02:28:06 +0000 (02:28 +0000)]

Merge "Add comment with packet tracker debugging tip"

commit | commitdiff | tree

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

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

Change-Id: I1cdba5a4bcca50a7c9e9983e95dd8ccb898f125e

commit | commitdiff | tree

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

Ajay Panicker [Tue, 14 Mar 2017 21:01:57 +0000 (14:01 -0700)]

resolve merge conflicts of 4b39c15da0f5 to nyc-mr2-dev-plus-aosp

Change-Id: I7567db6d1fbb9f8a8b5e29c3e24cdff6508c4b6f

commit | commitdiff | tree

Marie Janssen [Tue, 14 Mar 2017 19:29:50 +0000 (19:29 +0000)]

Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a am: 89d2b46a4a
am: c1a5939026

Change-Id: I50df57c208542d35bc72851fa37e47731bbd9965

commit | commitdiff | tree

Marie Janssen [Tue, 14 Mar 2017 19:21:49 +0000 (19:21 +0000)]

Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a
am: 89d2b46a4a

Change-Id: I5f710900167558283cb9e898c2022d8991dbb5c3

commit | commitdiff | tree

Marie Janssen [Tue, 14 Mar 2017 19:16:47 +0000 (19:16 +0000)]

Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
am: 4034a9a96a

Change-Id: Ie63f9d24ab37c5465b250d2b9b60efdf736b4d60

commit | commitdiff | tree

Svetoslav Ganov [Tue, 14 Mar 2017 19:12:23 +0000 (19:12 +0000)]

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

Change-Id: I9ed4aca6b9d23a4e8196bdb9595c5e1b8fd2faf4

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

Marie Janssen [Tue, 14 Mar 2017 17:09:52 +0000 (10:09 -0700)]

Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c

Change-Id: I2b9aeca138aefb0579b3be8014b3f0bf49d99764

commit | commitdiff | tree

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

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

Change-Id: I5c86f4dd87a369640248a3fdd953912f0d92e8f4

commit | commitdiff | tree

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

hotspot2: hide validate method for Passpoint configuration am: b5ca6f36b5
am: 9c0f6f3db7

Change-Id: I4c4b6f107b4cb603c6ab3f356e25eed8c0f18c33

commit | commitdiff | tree

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

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

Change-Id: Ibab3d0b8900bcfdea8145a23bb2f7694bbc37700

commit | commitdiff | tree

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

hotspot2: update Passpoint intent definitions am: 5679145d9a
am: c4d5850d3e

Change-Id: I28c59915fdd7215ea66b1a2ce9181d7d2890ae9f

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

Marie Janssen [Tue, 14 Mar 2017 16:01:07 +0000 (16:01 +0000)]

Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-dev

commit | commitdiff | tree

Kenny Guy [Tue, 14 Mar 2017 12:25:59 +0000 (12:25 +0000)]

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0 am: 11c5ff0399
am: d49386eaa5

Change-Id: If8ade174d66418ecd43606cd57a98655e37deec8

commit | commitdiff | tree

Kenny Guy [Tue, 14 Mar 2017 12:21:00 +0000 (12:21 +0000)]

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0
am: 11c5ff0399

Change-Id: I649c06ea01b23db5668fa0694528cffd823b8d7b

commit | commitdiff | tree

Kenny Guy [Tue, 14 Mar 2017 12:16:23 +0000 (12:16 +0000)]

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3
am: 00b77edec0

Change-Id: I16ea6b1c11cde1b9491826d7e95dc9bf3a45458b

commit | commitdiff | tree

Kenny Guy [Tue, 14 Mar 2017 12:11:54 +0000 (12:11 +0000)]

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0
am: c5d86736d3

Change-Id: I0886d46f74fec980eb8bd6c99d8b647e294bcb21

commit | commitdiff | tree

Kenny Guy [Tue, 14 Mar 2017 12:07:26 +0000 (12:07 +0000)]

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
am: 2df7f9f9c0

Change-Id: I9ca23aa395e0120413a60174e9b7ef44d91a90b1

commit | commitdiff | tree

Kenny Guy [Tue, 14 Mar 2017 12:01:54 +0000 (12:01 +0000)]

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev

commit | commitdiff | tree

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

Add comment with packet tracker debugging tip

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - "adb shell dumpsys wifi ipmanager" shows the debugging tip

Change-Id: Ifcccbdd81a0fc8beb7801ec7c3f78e8a941bc72b

commit | commitdiff | tree

Erik Kline [Tue, 14 Mar 2017 06:13:10 +0000 (06:13 +0000)]

Merge "Address some comments on IpManagerTest" am: b2afa1ede5
am: dea2371e71

Change-Id: Iac9eccca662fccc2da7d81c6d86d1623cccef342

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:19:56 +0000 (03:19 +0000)]

Merge "Skeleton of an IpManagerTest" am: db4333a2c2
am: cf07e0d541

Change-Id: I9b0ed1aff8ba7d5465bff3d6fa8f9048153c8a44

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:15:46 +0000 (01:15 +0000)]

Merge "carrier default app notification polish" am: b2bb98e62d
am: 921a49f7f8

Change-Id: I318953e330252694fb64cde9d2f5e8a540384a1c

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:16:24 +0000 (18:16 +0000)]

Merge "Bluetooth 5 spelling fixes" am: 5465fe0a2d
am: 58569de4de

Change-Id: I6abd6becaf54fd59abe894fc6c71c46ce4361c8d

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

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

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

Change-Id: I91d20bc046b721456e0a141def790aeccfbd39a6

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:35:48 +0000 (07:35 +0000)]

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

Change-Id: I2830664720e366792a8b35eac5295995c96461fa

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:14:12 +0000 (07:14 +0000)]

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

Change-Id: Ie563d1b8f64e2b42d3a146495dfdfafdd5e1965a

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:18:57 +0000 (00:18 +0000)]

Merge "Simple cleanups to Tethering" am: 7eaa2ad172
am: 921c40c0ce

Change-Id: I95b614848060fc2b43f646dbe64409d3cd6fd04e

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:36:09 +0000 (23:36 +0000)]

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

Change-Id: Iac3ff86d133cbd8cdbee69456be0677a5c2f7c51

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:11:43 +0000 (23:11 +0000)]

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

Change-Id: Idf0d156db9cbadd72ca32a23f3791d29df3fabe3

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:47:09 +0000 (20:47 +0000)]

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

Change-Id: I91f5108861ed4eb47d9fae13860e79babf0f4bf9

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:22:01 +0000 (17:22 +0000)]

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

Change-Id: Id74e92bd7fea99e94536f4d3e992828aa84aa671

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:57:33 +0000 (09:57 +0000)]

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

Change-Id: I12f02f834aef5928354e6afed560db60ddf2a284

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

fionaxu [Fri, 10 Mar 2017 09:48:21 +0000 (09:48 +0000)]

Merge "decouple carrierdefaultapp from phone process" am: e32fc81c5d
am: 1fdd29d799

Change-Id: If09f032ad197665d1829f49ef10c0819ccb2e373

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

Fyodor Kupolov [Fri, 10 Mar 2017 04:18:53 +0000 (04:18 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1 am: 6ca67f067a am: e385c8a0b9
am: aeb33eb0a8

Change-Id: Ic40ee441c6ba8ed2289cc6b1a8ac2414e2f5d928

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 04:12:42 +0000 (04:12 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1 am: 6ca67f067a
am: e385c8a0b9

Change-Id: I013ae3547aa049a19aae6840e9e80a4a361527e3

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 04:04:01 +0000 (04:04 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1
am: 6ca67f067a

Change-Id: Ibd38a2b0bd180180bb3812dedaf22ab07000aee9

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:58:02 +0000 (03:58 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a
am: ff5be765b1

Change-Id: I4fb68c79924a046a065f893b14877fb6d6e21632

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:48:47 +0000 (03:48 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours
am: 1fd70c201a

Change-Id: Ia89d648b7b9042781c41a8bb0ffa7a125b3f36d1

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:40:12 +0000 (03:40 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f
am: f7cde31747 -s ours

Change-Id: I801cd8c8e607f2c88edb26ea1947e650f128df4d

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:34:38 +0000 (03:34 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4
am: f937aabb0f

Change-Id: I6c0bf6190e96b34b6995337a94c451b4b172c168

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:28:56 +0000 (03:28 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886
am: 9e2cf8e5c4

Change-Id: I4d447f67d293a1cc4a187d66496cb447612eebad

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:28:51 +0000 (03:28 +0000)]

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f am: a1aa5cb34a am: e3e01cc375 am: 6ce5879e11
am: 68b9522d45

Change-Id: I0c47434e3e5297dc392a1b58a84f0f51ca89d1c7

commit | commitdiff | tree

Fyodor Kupolov [Fri, 10 Mar 2017 03:24:44 +0000 (03:24 +0000)]

[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours am: 567e742daf am: 5a16e06272 am: 73ceabb948 am: e2aeaa9998
am: 52a0172003

Change-Id: I4d80106165ea38fd44ef3a73aeeaac02077219be

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help