OSDN Git Service

android-x86/frameworks-base.git
6 years agodocs: Adding file to support staging reference docs
Andrew Solovay [Tue, 9 Jan 2018 21:35:52 +0000 (21:35 +0000)]
docs: Adding file to support staging reference docs
am: c40eccd9ad

Change-Id: I1fd3ee5b710619db76e8c488e1bfaf00950e0b05

6 years agoMerge "Fix sync initialization on secondary users" am: 99f99a52e7
Makoto Onuki [Tue, 9 Jan 2018 21:13:15 +0000 (21:13 +0000)]
Merge "Fix sync initialization on secondary users" am: 99f99a52e7
am: ad4c0c4add

Change-Id: I6f991fc7e2186253852cabf55ea95a6a0fbeb6da

6 years agoMerge "Fix sync initialization on secondary users"
Makoto Onuki [Tue, 9 Jan 2018 21:06:07 +0000 (21:06 +0000)]
Merge "Fix sync initialization on secondary users"
am: 99f99a52e7

Change-Id: I29f9430a6a3fb8c8a77621f68b0af37b94e3be21

6 years agoMerge "Fix sync initialization on secondary users"
Treehugger Robot [Tue, 9 Jan 2018 20:56:47 +0000 (20:56 +0000)]
Merge "Fix sync initialization on secondary users"

6 years agoMerge "Fix ResolverActivity don't show items" am: e251bb72ed
gaochong [Tue, 9 Jan 2018 20:47:22 +0000 (20:47 +0000)]
Merge "Fix ResolverActivity don't show items" am: e251bb72ed
am: 7fd3a8d08b

Change-Id: Ia76b696bcd1ec5763ec3da41fae4c8c2bce9b820

6 years agoMerge "Fix ResolverActivity don't show items"
gaochong [Tue, 9 Jan 2018 20:39:35 +0000 (20:39 +0000)]
Merge "Fix ResolverActivity don't show items"
am: e251bb72ed

Change-Id: Id4877102db82616c5ad1c6e929721fbddb92b129

6 years agoMerge "Fix ResolverActivity don't show items"
Treehugger Robot [Tue, 9 Jan 2018 20:30:29 +0000 (20:30 +0000)]
Merge "Fix ResolverActivity don't show items"

6 years agoMerge "Remove hashing for PII in Telecom Logging" am: e77808d936
Brad Ebinger [Tue, 9 Jan 2018 19:55:12 +0000 (19:55 +0000)]
Merge "Remove hashing for PII in Telecom Logging" am: e77808d936
am: 388aca53f1

Change-Id: I6e6ab2560ef73816dad5eff2b40f632fbdcefe33

6 years agoMerge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
Benedict Wong [Tue, 9 Jan 2018 19:51:19 +0000 (19:51 +0000)]
Merge "Add validation to IpSecConfig algorithm setters" am: a954f20f46
am: c93df5ca1c

Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a

6 years agoMerge "Add patb to owners" am: a2525e506d
Todd Kennedy [Tue, 9 Jan 2018 19:47:27 +0000 (19:47 +0000)]
Merge "Add patb to owners" am: a2525e506d
am: d14b30205c

Change-Id: Idc8607b6a377a560a1a713de8153068ab25594ea

6 years agoMerge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8
Malcolm Chen [Tue, 9 Jan 2018 19:43:02 +0000 (19:43 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants." am: 289b3fbca8
am: 4d2ffac581

Change-Id: I349cd20ecbcb801a1e93d4a215d65df432f5df69

6 years agoMerge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2
Hans Boehm [Tue, 9 Jan 2018 19:38:55 +0000 (19:38 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2
am: c9e7c10afb

Change-Id: I70169c5eeb5dbdaa751ea7b9369feb3663d79952

6 years agoMerge "Don't wait for NFC when shutting down." am: 5d286326b1
Ruchi Kandoi [Tue, 9 Jan 2018 19:35:09 +0000 (19:35 +0000)]
Merge "Don't wait for NFC when shutting down." am: 5d286326b1
am: a9d1e2a922

Change-Id: Idcc78ffebaa359110b85fbda8569c7dd71b3ec68

6 years agoMerge "Remove hashing for PII in Telecom Logging"
Brad Ebinger [Tue, 9 Jan 2018 19:26:18 +0000 (19:26 +0000)]
Merge "Remove hashing for PII in Telecom Logging"
am: e77808d936

Change-Id: Ib3e5180536ded4094c65476f5d5203f6c094f204

6 years agoMerge "Remove hashing for PII in Telecom Logging"
Brad Ebinger [Tue, 9 Jan 2018 19:18:42 +0000 (19:18 +0000)]
Merge "Remove hashing for PII in Telecom Logging"

6 years agoMerge "Add validation to IpSecConfig algorithm setters"
Benedict Wong [Tue, 9 Jan 2018 18:31:14 +0000 (18:31 +0000)]
Merge "Add validation to IpSecConfig algorithm setters"
am: a954f20f46

Change-Id: I7d241a4348fd1339ff7475ee9301c7fe6c7453c0

6 years agoMerge "Add validation to IpSecConfig algorithm setters"
Benedict Wong [Tue, 9 Jan 2018 18:18:28 +0000 (18:18 +0000)]
Merge "Add validation to IpSecConfig algorithm setters"

6 years agoMerge "Add patb to owners"
Todd Kennedy [Tue, 9 Jan 2018 17:31:44 +0000 (17:31 +0000)]
Merge "Add patb to owners"
am: a2525e506d

Change-Id: Iae9eaea2fee3253155c957a000ca7eeb80474503

6 years agoMerge "Add patb to owners"
Todd Kennedy [Tue, 9 Jan 2018 17:21:12 +0000 (17:21 +0000)]
Merge "Add patb to owners"

6 years agoAdd patb to owners
Todd Kennedy [Tue, 9 Jan 2018 17:19:15 +0000 (09:19 -0800)]
Add patb to owners

Test: None
Change-Id: I70429cd02fac901efd16e47e6566358c78ae0e23

6 years agoMerge "Rename RadioNetworkConstants to NetworkConstants."
Malcolm Chen [Tue, 9 Jan 2018 07:11:43 +0000 (07:11 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants."
am: 289b3fbca8

Change-Id: Ic7d966c3e7ce1b8adc9ca3acd461d6e65df2cffe

6 years agoMerge "Rename RadioNetworkConstants to NetworkConstants."
Treehugger Robot [Tue, 9 Jan 2018 07:04:01 +0000 (07:04 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants."

6 years agoFix ResolverActivity don't show items
gaochong [Tue, 9 Jan 2018 06:02:23 +0000 (14:02 +0800)]
Fix ResolverActivity don't show items

ResolverActivity sort the list resolved intent with AsyncTask.
The method sort hold CountDownLatch to wait the time-consuming
operation. In some case, the operation doesn't end and the
CountDownLatch can't be released.The default excutor of AsyncTask
is serial. There should release CountDownLatch in destroy()
to avoid this case.

Change-Id: Ie10126f735d9f511dfe086c21f3f5ffaeb831086
Signed-off-by: gaochong <gaochong@xiaomi.com>
Test: manual - repeatedly test ResolverActivity show correctly
Bug: 71730061

6 years agoMerge "Only count uncleared ProxyMap refs when deciding to crash"
Hans Boehm [Tue, 9 Jan 2018 04:46:32 +0000 (04:46 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash"
am: 90027eb1c2

Change-Id: I56471aa9ac0b93e3280b48fed3b29ad2b743cf39

6 years agoMerge "Only count uncleared ProxyMap refs when deciding to crash"
Hans Boehm [Tue, 9 Jan 2018 04:35:31 +0000 (04:35 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash"

6 years agoMerge "Don't wait for NFC when shutting down."
Ruchi Kandoi [Tue, 9 Jan 2018 00:01:09 +0000 (00:01 +0000)]
Merge "Don't wait for NFC when shutting down."
am: 5d286326b1

Change-Id: Ie1a26e5b7905fc7b1a6dbe0e1ee8f80c1030d1cc

6 years agodocs: Adding file to support staging reference docs
Andrew Solovay [Mon, 8 Jan 2018 23:57:29 +0000 (15:57 -0800)]
docs: Adding file to support staging reference docs

We use the devsite tool to stage reference docs for review (to
go/dac-stage). That tool is currently broken, because it's expecting
to find a _reference-head-tags.html file which currently exists in
Piper but not in Gerrit. Copying that file into Gerrit lets us
build the Javadocs and stage them. (Files in p/f/b/docs don't
generally affect anything outside of the doc builds.)

Tested by building docs and staging Adapter.html to:
go/dac-stage/reference/android/widget/Adapter.html

Test: make ds-docs
Bug: 71717397
Change-Id: I05430f2d9f23e62b4423b2d6f304c4be1c43b880

6 years agoMerge "Don't wait for NFC when shutting down."
Treehugger Robot [Mon, 8 Jan 2018 23:49:06 +0000 (23:49 +0000)]
Merge "Don't wait for NFC when shutting down."

6 years agoDon't wait for NFC when shutting down.
Ruchi Kandoi [Wed, 18 Oct 2017 20:06:40 +0000 (13:06 -0700)]
Don't wait for NFC when shutting down.

NFC doesn't store any state before powering off, and hence it is okay to
not wait for it while shutting down.

Bug: 65761561
Test: Boot and shutdown
Change-Id: Ic8243bdb9c6d12daf6cff5784046286bfa8f4d53
(cherry picked from commit 20bc30f4cedff1043c4c665cfe68f7d7fd16a801)
Merged-In: Ic8243bdb9c6d12daf6cff5784046286bfa8f4d53

6 years agoOnly count uncleared ProxyMap refs when deciding to crash
Hans Boehm [Wed, 3 Jan 2018 01:36:27 +0000 (17:36 -0800)]
Only count uncleared ProxyMap refs when deciding to crash

Add a method to compute the size of a ProxyMap without cleared
references. Use it in the crash decision. Report both counts, as
well as the count after a forced GC before actually crashing.

Rename the histogram generating function after a small refactoring
to make that easier.

When we crash, we now generate a message like the following
(generated here with reduced thresholds):

01-03 01:40:52.273  4793  4947 E JavaBinder: java.lang.AssertionError:
Binder ProxyMap has too many entries: 277 (total), 275 (uncleared),
257 (after GC). BinderProxy leak?

after the histogram. Unfortunately, the intervening GC may take some
time, and other intervening messages may sneak into the log between
them.

Experiments so far suggest that none of this greatly affects the
decision when to die. But this eliminates uncertainty as to whether
there was really a problem.

Bug: 71353150

Test: Tested with reduced thresholds, and then booted AOSP.
Change-Id: I53f24bae23eedcdb78a1c32296c65692b7bb2c42

6 years agoMerge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config...
Cassie Han [Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config." am: 9c1279d2ae
am: 28dd9dfeb5

Change-Id: I9b8a48709850b545b806fb605d1d94e9cdefe1d0

6 years agoMerge "Add a Java FindAddress implentation." am: 9ea410a6f8
Toby Sargeant [Mon, 8 Jan 2018 21:23:45 +0000 (21:23 +0000)]
Merge "Add a Java FindAddress implentation." am: 9ea410a6f8
am: da4e3b68fb

Change-Id: I7b2448fcb2edb4bc9000fd5e55f7295e6c6ff676

6 years agoMerge "Remove obsolete aidl list" am: abac8f7a86
Colin Cross [Mon, 8 Jan 2018 21:20:44 +0000 (21:20 +0000)]
Merge "Remove obsolete aidl list" am: abac8f7a86
am: 6b8fff4eb5

Change-Id: If5a5bf062a0fa586349763da9654b698dae0b30d

6 years agoMerge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annot...
Jack He [Mon, 8 Jan 2018 21:13:52 +0000 (21:13 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations" am: 25259faa27
am: d16d93361b

Change-Id: I525cbc81c450afafd3fcedaf7b1b5e4b17a4162a

6 years agoMerge "Move to libc++ from stlport." am: c6dd5f9037
Dan Albert [Mon, 8 Jan 2018 21:09:59 +0000 (21:09 +0000)]
Merge "Move to libc++ from stlport." am: c6dd5f9037
am: 81da46f982

Change-Id: I3c7f169097ef1c4d17263893a18ad21b9dae7d49

6 years agoMerge "Add virtual dtor for virtual classes" am: 27f61a94d6
Yi Kong [Mon, 8 Jan 2018 21:07:09 +0000 (21:07 +0000)]
Merge "Add virtual dtor for virtual classes" am: 27f61a94d6
am: 2d7813a4a7

Change-Id: I8787ff83ec93f5a8ae2e08e1af573d13750d9aa5

6 years agoMerge "Added internal API to get/set the A2DP Active Device" am: 6efee9c079
Pavlin Radoslavov [Mon, 8 Jan 2018 21:02:01 +0000 (21:02 +0000)]
Merge "Added internal API to get/set the A2DP Active Device" am: 6efee9c079
am: e3428dae04

Change-Id: If220447db71398cc305eb7a702896e21959110c8

6 years agoMerge "Generic Mutable class for HIDL code." am: 0f05ce94c3
Steven Moreland [Mon, 8 Jan 2018 20:25:30 +0000 (20:25 +0000)]
Merge "Generic Mutable class for HIDL code." am: 0f05ce94c3
am: a4ac12c3ac

Change-Id: I1914e805b15064b40b963840eddf87a0bbd41169

6 years agoMerge "Bluetooth: Remove strings for enabling inband ringing" am: 02a0397643
Jack He [Mon, 8 Jan 2018 20:20:19 +0000 (20:20 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing" am: 02a0397643
am: 37f987d7ee

Change-Id: I2d5a62b3eb22bd10c350495726307674107778b4

6 years agoMerge changes from topic "ipsec-resource-id-cleanup" am: 2b36299c73
nharold [Mon, 8 Jan 2018 20:16:08 +0000 (20:16 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup" am: 2b36299c73
am: d7319df4d0

Change-Id: If6ab575e2f30fc70d73e6f8787c87f3c7a2ab09d

6 years agoMerge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
Cassie Han [Mon, 8 Jan 2018 17:32:39 +0000 (17:32 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
am: 9c1279d2ae

Change-Id: I2c5c351cbe01bd5bd66d15a382ff6df5bede8c6a

6 years agoMerge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
Cassie Han [Mon, 8 Jan 2018 17:25:26 +0000 (17:25 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."

6 years agoMerge "Add a Java FindAddress implentation."
Toby Sargeant [Mon, 8 Jan 2018 12:16:00 +0000 (12:16 +0000)]
Merge "Add a Java FindAddress implentation."
am: 9ea410a6f8

Change-Id: Iff0adac9310f836df5f75c64c17ea3c72cd940d4

6 years agoMerge "Add a Java FindAddress implentation."
Toby Sargeant [Mon, 8 Jan 2018 12:05:12 +0000 (12:05 +0000)]
Merge "Add a Java FindAddress implentation."

6 years agoMerge "Remove obsolete aidl list"
Colin Cross [Sat, 6 Jan 2018 17:56:13 +0000 (17:56 +0000)]
Merge "Remove obsolete aidl list"
am: abac8f7a86

Change-Id: If4b2f5693947dfd8d35531d7a399b7f3d764506f

6 years agoMerge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annot...
Jack He [Sat, 6 Jan 2018 17:51:45 +0000 (17:51 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations"
am: 25259faa27

Change-Id: Ife08cbcb0490f55c81f239f96aef6e8e2a02e8d3

6 years agoMerge "Move to libc++ from stlport."
Dan Albert [Sat, 6 Jan 2018 17:47:49 +0000 (17:47 +0000)]
Merge "Move to libc++ from stlport."
am: c6dd5f9037

Change-Id: Ie42f0cf03a005215b96bbbef16ea62e541fb12a8

6 years agoMerge "Add virtual dtor for virtual classes"
Yi Kong [Sat, 6 Jan 2018 17:44:50 +0000 (17:44 +0000)]
Merge "Add virtual dtor for virtual classes"
am: 27f61a94d6

Change-Id: Ic45e81f483e31b01abe6195bd63174c8253b82ae

6 years agoMerge "Added internal API to get/set the A2DP Active Device"
Pavlin Radoslavov [Sat, 6 Jan 2018 17:41:05 +0000 (17:41 +0000)]
Merge "Added internal API to get/set the A2DP Active Device"
am: 6efee9c079

Change-Id: I5e82a41c4bcf546bdc8fd08c56103c333745c60c

6 years agoMerge "Generic Mutable class for HIDL code."
Steven Moreland [Sat, 6 Jan 2018 17:37:23 +0000 (17:37 +0000)]
Merge "Generic Mutable class for HIDL code."
am: 0f05ce94c3

Change-Id: I8ee4b650b96279efe26bdacb4d09a6a0317960e7

6 years agoMerge "Bluetooth: Remove strings for enabling inband ringing"
Jack He [Sat, 6 Jan 2018 17:32:38 +0000 (17:32 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"
am: 02a0397643

Change-Id: Id6c9ab4a230e5c242402f78212f21943e1a7604f

6 years agoMerge changes from topic "ipsec-resource-id-cleanup"
nharold [Sat, 6 Jan 2018 17:29:12 +0000 (17:29 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup"
am: 2b36299c73

Change-Id: I5461b0e0746f8c60b425126d9badbae4630395bb

6 years agoTurn default gradient into solid black
Lucas Dupin [Sat, 6 Jan 2018 03:34:46 +0000 (03:34 +0000)]
Turn default gradient into solid black
am: 12dad0c4fc

Change-Id: I6f5c702487f46395bd1930d943782d1a9b6bac5d

6 years agoMerge "Remove obsolete aidl list"
Treehugger Robot [Sat, 6 Jan 2018 02:50:58 +0000 (02:50 +0000)]
Merge "Remove obsolete aidl list"

6 years agoRemove obsolete aidl list
Colin Cross [Thu, 4 Jan 2018 22:59:10 +0000 (14:59 -0800)]
Remove obsolete aidl list

Remove the obsolete aidl list, framework.aidl is now generated
from the stubs jars.

Bug: 70046217
Test: m checkbuild
Change-Id: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
Merged-In: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
(cherry picked from commit fac48f998e763060dfdfb6e76927ec85aa63e1eb)

6 years agoMerge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annot...
Treehugger Robot [Sat, 6 Jan 2018 01:28:40 +0000 (01:28 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations"

* changes:
  HFP: Add APIs for set and get active device (1/3)
  Add SystemApis annotations

6 years agoMerge "Move to libc++ from stlport."
Treehugger Robot [Sat, 6 Jan 2018 00:35:49 +0000 (00:35 +0000)]
Merge "Move to libc++ from stlport."

6 years agoMerge "Add virtual dtor for virtual classes"
Treehugger Robot [Fri, 5 Jan 2018 23:27:33 +0000 (23:27 +0000)]
Merge "Add virtual dtor for virtual classes"

6 years agoTurn default gradient into solid black
Lucas Dupin [Mon, 30 Oct 2017 18:09:25 +0000 (11:09 -0700)]
Turn default gradient into solid black

Test: visual
Bug: 66957450
Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f
(cherry picked from commit e7476addecb4fec6abd08cfb7aa27c473ce5c1f0)

6 years agoHFP: Add APIs for set and get active device (1/3)
Jack He [Wed, 3 Jan 2018 20:13:26 +0000 (12:13 -0800)]
HFP: Add APIs for set and get active device (1/3)

1. Call BluetoothHeadset.setActiveDevice(BluetoothDevice device) to set
   a connected HFP/HSP device as active.
2. Listen for BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intent
   that will contain the latest active device (in EXTRA_DEVICE field).
   If the active device could not be changed, the EXTRA_DEVICE
   field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
   can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothHeadset.setActiveDevice() could be called by some other parts of
   the system, so interested parties should always listen for
   BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
   for active device updates.

Bug: 68951996
Test: manual
Change-Id: I22ca639a04fed7bf17df59c405ddeda90dafb8ff

6 years agoAdd SystemApis annotations
Selim Gurun [Wed, 18 Oct 2017 00:01:38 +0000 (17:01 -0700)]
Add SystemApis annotations

There are some number of places where bluetooth APIs are used via
reflection from GMSCore. Add proper annotations.

Bug: 67052734
Test: Manual - and using make update-api
Change-Id: Ib6e3aa1ff5b6f9cdc78367f9be13ed00542d6f65
(cherry picked from commit 64bd35ef2cb40bbf9476a3bf63a763d5a32cc73b)

6 years agoMerge "Added internal API to get/set the A2DP Active Device"
Pavlin Radoslavov [Fri, 5 Jan 2018 21:45:31 +0000 (21:45 +0000)]
Merge "Added internal API to get/set the A2DP Active Device"

6 years agoAdded internal API to get/set the A2DP Active Device
Pavlin Radoslavov [Tue, 19 Dec 2017 21:20:06 +0000 (13:20 -0800)]
Added internal API to get/set the A2DP Active Device

1. Call BluetoothA2dp.setActiveDevice(BluetoothDevice device) to set
   a connected A2DP device as active.
   The value of "device" could be null to clear the active device
   and stop streaming audio to a Bluetooth device.
2. Listen for BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intent
   that will contain the latest active device (in EXTRA_DEVICE field).
   If the active device could not be changed, the EXTRA_DEVICE
   field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
   can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothA2dp.setActiveDevice() could be called by some other parts of
   the system, so interested parties should always listen for
   BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
   for active device updates.

Bug: 71555243
Test: Manual
Change-Id: I661b6882e8e6b437db50210aec1dd12a10199969

6 years agoMerge "Generic Mutable class for HIDL code."
Treehugger Robot [Fri, 5 Jan 2018 21:44:37 +0000 (21:44 +0000)]
Merge "Generic Mutable class for HIDL code."

6 years agoMerge "Bluetooth: Remove strings for enabling inband ringing"
Treehugger Robot [Fri, 5 Jan 2018 20:41:01 +0000 (20:41 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"

6 years agoGeneric Mutable class for HIDL code.
Steven Moreland [Fri, 5 Jan 2018 17:41:10 +0000 (09:41 -0800)]
Generic Mutable class for HIDL code.

In general, using Mutable inside of structures
or as API arguments is a code smell. However, it
is the most syntactically clean way of fetching
something out of a lambda or inner class.

Using this, one can do:
Mutable<Result> res = new Mutable<>();
hidlObject.foo((...) -> {
    res.value = ...;
});

There is an alternative:
Result a[] = new Result[1];
hidlObject.foo((...) -> {
    a[0] = ...;
});

However, this alternative syntax is relatively messy.

Bug: N/A
Test: boot, use w/ wifi
Change-Id: Ibff13c653cc17bd25ddbb0534ba21ef485bff7aa

6 years agoBluetooth: Remove strings for enabling inband ringing
Jack He [Thu, 7 Dec 2017 23:18:40 +0000 (15:18 -0800)]
Bluetooth: Remove strings for enabling inband ringing

* As in-band ringing is enabled by default on supported devices, user
  action in development settings should be disabling it instead of
  enabling it
* The new string is added to packages/apps/Settings and the old string
  is hence removed from SettingsLib

Bug: 65383086
Test: make, try toggling the preference and verify in-band ringing's
      behavior
Change-Id: I18858e86f4127f6555cce27d239d2682b6134fe2
Merged-In: I18858e86f4127f6555cce27d239d2682b6134fe2
(cherry picked from commit 326f1db42cabe8a7f2bcaef441a3353af98bba5f)

6 years agoMove to libc++ from stlport.
Dan Albert [Fri, 5 Jan 2018 19:08:20 +0000 (11:08 -0800)]
Move to libc++ from stlport.

Test: make checkbuild
Bug: None
Change-Id: If2be2abedec1abb2970e8c42170d4a69c0fb4e3d

6 years agoMerge changes from topic "ipsec-resource-id-cleanup"
nharold [Fri, 5 Jan 2018 19:05:09 +0000 (19:05 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup"

* changes:
  IpSecService - Convert mNextResourceId from AtomicInt to Int
  IpSec Invalidate the Resource IDs on close()

6 years agoAdd a Java FindAddress implentation.
Tobias Sargeant [Fri, 5 Jan 2018 14:34:38 +0000 (14:34 +0000)]
Add a Java FindAddress implentation.

This stops calling findAddress (possibly indirectly via Linkify) from
loading webview native code, resulting in a performance and memory
improvement for those apps that call WebView#findAddress but do not
otherwise use WebView.

Bug: 22362008
Test: Existing WebView CTS test.
Change-Id: I5fcab725ceaf0d6a00e931d3b6cd2f3799d68391

6 years agoMerge "Account: Fix the risk of sqliteconnection leak" am: 766f0a4981
Fyodor Kupolov [Fri, 5 Jan 2018 02:10:46 +0000 (02:10 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak" am: 766f0a4981
am: 130d5e3915

Change-Id: I89eb0c20c06c7b077b59a4aa66b6693014192e43

6 years agoMerge "Account: Fix the risk of sqliteconnection leak"
Fyodor Kupolov [Fri, 5 Jan 2018 02:03:33 +0000 (02:03 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak"
am: 766f0a4981

Change-Id: I7e0c6ee50fba9563ba45231709e0df8a3dbe266c

6 years agoMerge "Account: Fix the risk of sqliteconnection leak"
Fyodor Kupolov [Fri, 5 Jan 2018 01:53:28 +0000 (01:53 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak"

6 years agoMerge changes I872a81ae,I0b9e72d2 am: f30c2c02f0
Andreas Gampe [Fri, 5 Jan 2018 01:39:13 +0000 (01:39 +0000)]
Merge changes I872a81ae,I0b9e72d2 am: f30c2c02f0
am: 34445736d8

Change-Id: I506b0e29977f0fbb410066dea46c99f264e01028

6 years agoMerge changes I872a81ae,I0b9e72d2
Andreas Gampe [Fri, 5 Jan 2018 01:30:56 +0000 (01:30 +0000)]
Merge changes I872a81ae,I0b9e72d2
am: f30c2c02f0

Change-Id: Ie495ff6b40f72203b5fae68fb00e35289b29f356

6 years agoMerge changes I872a81ae,I0b9e72d2
Treehugger Robot [Fri, 5 Jan 2018 01:14:44 +0000 (01:14 +0000)]
Merge changes I872a81ae,I0b9e72d2

* changes:
  Revert "Frameworks: Move SharedPreferencesImpl to Future"
  Revert "Frameworks: Silently ignore InterruptedException"

6 years agoAdd validation to IpSecConfig algorithm setters
Benedict Wong [Tue, 7 Nov 2017 04:49:10 +0000 (20:49 -0800)]
Add validation to IpSecConfig algorithm setters

Adds checks to ensure that users can only set the correct types of
algorithms for the Authentication, Encryption and Authenticated
Encryption algorithms.

Bug: 65223935
Test: Added tests in IpSecConfigTest, and passed on aosp_marlin-eng
Change-Id: I462c77d9eb5710b8d03a48866453649d3b6fc6bf

6 years agoIpSecService - Convert mNextResourceId from AtomicInt to Int
Nathan Harold [Thu, 14 Dec 2017 03:16:33 +0000 (19:16 -0800)]
IpSecService - Convert mNextResourceId from AtomicInt to Int

The mNextResourceId variable is only accessed within synchronized
blocks, so there is no need to use an atomic integer to synchronize
it. This eliminates the misleading notion that the variable is
accessed outside of guarded blocks, which it is not.

Bug: 62279167
Test: cts
Change-Id: I815835622659f54d2d2d33b349b17c632ebced8d

6 years agoIpSec Invalidate the Resource IDs on close()
Nathan Harold [Thu, 14 Dec 2017 02:51:35 +0000 (18:51 -0800)]
IpSec Invalidate the Resource IDs on close()

To facilitate error checking we should invalidate
the resource IDs of all objects when we close() them.
Today, the resource ID is invalidated on the Transform
object but not on the SPI or Encap Socket. This CL
unifies the behavior.

Bug: 70641274
Test: cts - IpSecManagerTest
Change-Id: I28caec3e913902c748c6a50b4ef742ccef8b1b09

6 years agoMerge "Fix CTS Test Dual Stack Test Passing Issue" am: ae81e15c9c
Manoj Boopathi Raj [Thu, 4 Jan 2018 18:59:41 +0000 (18:59 +0000)]
Merge "Fix CTS Test Dual Stack Test Passing Issue" am: ae81e15c9c
am: a19acb6ac8

Change-Id: Ica9ded5c7bdbeb243c63a3ebb1ca273d4c8f4138

6 years agoMerge "Fix CTS Test Dual Stack Test Passing Issue"
Manoj Boopathi Raj [Thu, 4 Jan 2018 18:51:12 +0000 (18:51 +0000)]
Merge "Fix CTS Test Dual Stack Test Passing Issue"
am: ae81e15c9c

Change-Id: I30778e45730e79bc071344fb31fd0038d739ee9d

6 years agoMerge "Fix CTS Test Dual Stack Test Passing Issue"
Manoj Boopathi Raj [Thu, 4 Jan 2018 18:32:00 +0000 (18:32 +0000)]
Merge "Fix CTS Test Dual Stack Test Passing Issue"

6 years agoMigrate flag config_telephony_use_own_number_for_voicemail to Carrier
Cassie [Thu, 4 Jan 2018 17:46:23 +0000 (09:46 -0800)]
Migrate flag config_telephony_use_own_number_for_voicemail to Carrier
Config.

Bug: 65683508
Test: Basic telephony sanity
Change-Id: I74a24b60bfc0b527f7f0cb6d7084bb7b36aae6e5

6 years agoMerge "Add API to get eUICC's OTA status" am: 15a410a75a
Qingxi Li [Thu, 4 Jan 2018 02:09:32 +0000 (02:09 +0000)]
Merge "Add API to get eUICC's OTA status" am: 15a410a75a
am: 412aecc2b0

Change-Id: I50ec4a84ddc30e5232bd0cabb8a721ebb7feca47

6 years agoMerge "Add API to get eUICC's OTA status"
Qingxi Li [Thu, 4 Jan 2018 02:02:04 +0000 (02:02 +0000)]
Merge "Add API to get eUICC's OTA status"
am: 15a410a75a

Change-Id: I634b04834840946b07d995222e5a26c029d0a053

6 years agoRevert "Frameworks: Move SharedPreferencesImpl to Future"
Andreas Gampe [Thu, 4 Jan 2018 01:22:35 +0000 (17:22 -0800)]
Revert "Frameworks: Move SharedPreferencesImpl to Future"

This reverts commit 70b600d45683b574104d10198da9bce49aa6be23.

In preparation for a different fix. There are too many loopholes
with updates vs commits.

Bug: 67986472
Bug: 71533447
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I872a81ae1a26e1f77aad2a52daf88e093a686ec6

6 years agoRevert "Frameworks: Silently ignore InterruptedException"
Andreas Gampe [Thu, 4 Jan 2018 01:21:09 +0000 (17:21 -0800)]
Revert "Frameworks: Silently ignore InterruptedException"

This reverts commit c8d5fc857208b08b984a802277807e9195b2f9a7.

In preparation for different fix.

Bug: 67986472
Bug: 70122540
Bug: 71533447
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I0b9e72d271725e15c20b68de981303c96ac1bd2a

6 years agoMerge "Add API to get eUICC's OTA status"
Treehugger Robot [Thu, 4 Jan 2018 01:50:43 +0000 (01:50 +0000)]
Merge "Add API to get eUICC's OTA status"

6 years agoMerge "Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint...
Android Build Merger (Role) [Thu, 4 Jan 2018 01:12:02 +0000 (01:12 +0000)]
Merge "Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev am: 4689a6d979" into oc-mr1-dev-plus-aosp

6 years agoMerge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc...
Pankaj Kanwar [Thu, 4 Jan 2018 01:10:55 +0000 (01:10 +0000)]
Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev
am: 4689a6d979

Change-Id: I190f53b2d8aa4202a9f20f3831581414185962d3

6 years agoMerge changes I9de0ffe9,Idc804896 am: 153fb1c6e0
Colin Cross [Thu, 4 Jan 2018 01:10:47 +0000 (01:10 +0000)]
Merge changes I9de0ffe9,Idc804896 am: 153fb1c6e0
am: 99161bc1c7

Change-Id: Id831c5ab771fa59ac9906d473ffeb7720fbbdf54

6 years agoMerge changes I9de0ffe9,Idc804896
Colin Cross [Thu, 4 Jan 2018 01:04:20 +0000 (01:04 +0000)]
Merge changes I9de0ffe9,Idc804896
am: 153fb1c6e0

Change-Id: I7cd9329c7ea8ef720df36059a491a9d627233d1a

6 years agoMerge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc...
Pankaj Kanwar [Thu, 4 Jan 2018 01:03:27 +0000 (01:03 +0000)]
Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev

6 years agoMerge changes I9de0ffe9,Idc804896
Colin Cross [Thu, 4 Jan 2018 00:48:50 +0000 (00:48 +0000)]
Merge changes I9de0ffe9,Idc804896

* changes:
  Use sdkparcelables to generate framework.aidl
  Initial sdkparcelables

6 years agoRename RadioNetworkConstants to NetworkConstants.
Malcolm Chen [Wed, 3 Jan 2018 20:10:33 +0000 (12:10 -0800)]
Rename RadioNetworkConstants to NetworkConstants.

Rename RadioNetworkConstants to NetworkConstants and some classes
inside it.

Bug: 64132030
Test: Build
Change-Id: I5f3d2310e4f8e556aa32b00e6b6bbe6c4d709afb

6 years agoAdd API to get eUICC's OTA status
Qingxi Li [Wed, 13 Dec 2017 23:13:02 +0000 (15:13 -0800)]
Add API to get eUICC's OTA status

The function will return current eUICC's OTA status and requests calling
app has WRITE_EMBEDDED_SUBSCRIPTIONS.

Test: E2E
Bug: 37279356
Change-Id: I823ed7aa9d86530c4bebd4c0b1a00f0c607105ed

6 years agoMerge "Move Ims related settings from global setting to subscription db." am: f2ebbd1356
Malcolm Chen [Wed, 3 Jan 2018 20:04:37 +0000 (20:04 +0000)]
Merge "Move Ims related settings from global setting to subscription db." am: f2ebbd1356
am: 5bf5c028f7

Change-Id: Iab3a7a47da5961471bce7a8e29960ab75e68719b

6 years agoMerge "Avoid NPE when missing underlyingCaps." am: 6522970c1e
Jeff Sharkey [Wed, 3 Jan 2018 19:56:28 +0000 (19:56 +0000)]
Merge "Avoid NPE when missing underlyingCaps." am: 6522970c1e
am: e35adbc4d2

Change-Id: Iacd2f15ad31ec7d5c83b21674e1e1f106a5fbd96

6 years agoMerge "Move Ims related settings from global setting to subscription db."
Malcolm Chen [Wed, 3 Jan 2018 19:52:36 +0000 (19:52 +0000)]
Merge "Move Ims related settings from global setting to subscription db."
am: f2ebbd1356

Change-Id: Ifc49cccd9f9ce47585367a3f0802ced5df94140b

6 years agoMerge "Avoid NPE when missing underlyingCaps."
Jeff Sharkey [Wed, 3 Jan 2018 19:47:22 +0000 (19:47 +0000)]
Merge "Avoid NPE when missing underlyingCaps."
am: 6522970c1e

Change-Id: Ibbd645fa42b8e6d4f4ae05260839ac87a2430519