OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask...
Cassie Han [Wed, 10 Jan 2018 00:55:32 +0000 (00:55 +0000)]
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."

6 years agoMerge "HFP: Add isInbandRingingEnabled() API (1/4)"
Treehugger Robot [Wed, 10 Jan 2018 00:07:11 +0000 (00:07 +0000)]
Merge "HFP: Add isInbandRingingEnabled() API (1/4)"

6 years agoMerge "Add isMobileDataEnabled in TelephonyManager."
Treehugger Robot [Tue, 9 Jan 2018 23:46:55 +0000 (23:46 +0000)]
Merge "Add isMobileDataEnabled in TelephonyManager."

6 years agoHFP: Add isInbandRingingEnabled() API (1/4)
Jack He [Sat, 6 Jan 2018 01:17:06 +0000 (17:17 -0800)]
HFP: Add isInbandRingingEnabled() API (1/4)

* Use BluetoothHeadset.isInbandRingingEnabled() API to check whether
  in-band ringing is currently enabled in the system when deciding on
  audio routes for ringtone
* Add this as a hidden internal API for system components

Bug: 71646213
Test: make, toggle in-band ringing from Development Settings and observe
      whether Telecom service tries to open SCO when there is an
      incoming call

Change-Id: I1ef0dd2b54ace7649ddd1f043f0ef5847743a5c4

6 years agoMerge "Add connection serivce focus api interface"
Treehugger Robot [Tue, 9 Jan 2018 22:54:42 +0000 (22:54 +0000)]
Merge "Add connection serivce focus api interface"

6 years agoMerge "BluetoothProfile: Add Object Push Profile (OPP)"
Treehugger Robot [Tue, 9 Jan 2018 22:10:01 +0000 (22:10 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)"

6 years agoMerge "Move zygote's seccomp setup to post-fork"
Treehugger Robot [Tue, 9 Jan 2018 21:41:19 +0000 (21:41 +0000)]
Merge "Move zygote's seccomp setup to post-fork"

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"
Treehugger Robot [Tue, 9 Jan 2018 20:30:29 +0000 (20:30 +0000)]
Merge "Fix ResolverActivity don't show items"

6 years agoMove zygote's seccomp setup to post-fork
Victor Hsieh [Wed, 20 Dec 2017 17:51:51 +0000 (09:51 -0800)]
Move zygote's seccomp setup to post-fork

Before this change, seccomp filter setup is as early as in zygote's main
function.  To make it possible to split app and system server's filter,
this postpone the setup to after fork.  It also starts to call app
specific and system server specific setup function.

In terms of performance since this happens at fork, the measure shows
the overhead is negligible.  Assuming 130 instruction in the BPF, on
walleye, even when running on little core with fixed low frequency, each
setup took about 60.9us on average.  When it runs on big core with
higher frequency, it took about 39.3us.

Test: (cts) -m CtsSecurityTestCases -t android.security.cts.SeccompTest
Bug: 63944145

Change-Id: I748735b478405098beac1e200d911c13ea60e380
Merged-In: I748735b478405098beac1e200d911c13ea60e380

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 agoAdd connection serivce focus api interface
Pengquan Meng [Wed, 22 Nov 2017 02:01:13 +0000 (18:01 -0800)]
Add connection serivce focus api interface

This add new api interface to ConnectionService to support the
connection service focus api.

Bug: 69651192
Test: manually

Change-Id: Iea49d95b086d32a0ebaf8e9f34fe4556953a0fd5
Merged-In: Iea49d95b086d32a0ebaf8e9f34fe4556953a0fd5

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: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."
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:35:31 +0000 (04:35 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash"

6 years agoAdd isMobileDataEnabled in TelephonyManager.
Malcolm Chen [Tue, 28 Nov 2017 23:57:14 +0000 (15:57 -0800)]
Add isMobileDataEnabled in TelephonyManager.

Added a new hidden API isMobileDataEnabled in TelephonyManager.
Rename related APIs to isUserMobileDataEnabled,
isUserMobileDataEnabled and setUserMobileDataEnabled to better
clarify their functionality.

Bug: 69814555
Test: build
Change-Id: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa
Merged-In: I2f186f1e7550cafbe4ee3a5af293c39274cbfeaa

6 years agoBluetoothProfile: Add Object Push Profile (OPP)
Myles Watson [Fri, 5 Jan 2018 21:54:34 +0000 (13:54 -0800)]
BluetoothProfile: Add Object Push Profile (OPP)

Test: toggle Bluetooth
Change-Id: I5aec940ba3d6c6364c2de667426d98d0b3cea0c6

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 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:05:12 +0000 (12:05 +0000)]
Merge "Add a Java FindAddress implentation."

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 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"
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
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"
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 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 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."
Treehugger Robot [Wed, 3 Jan 2018 19:42:24 +0000 (19:42 +0000)]
Merge "Move Ims related settings from global setting to subscription db."

6 years agoAdd virtual dtor for virtual classes
Yi Kong [Wed, 27 Dec 2017 22:10:54 +0000 (14:10 -0800)]
Add virtual dtor for virtual classes

delete called on non-final virtual classes but non-virtual destructor.

Fixes -Wdelete-non-virtual-dtor warning.

Test: m checkbuild
Change-Id: I142a2f70286a28722e462df4c160cb7aa3753c2a

6 years agoMerge "Avoid NPE when missing underlyingCaps."
Jeff Sharkey [Wed, 3 Jan 2018 19:33:00 +0000 (19:33 +0000)]
Merge "Avoid NPE when missing underlyingCaps."

6 years agoMerge "Modify getting of primary storage size"
Treehugger Robot [Wed, 3 Jan 2018 01:10:49 +0000 (01:10 +0000)]
Merge "Modify getting of primary storage size"

6 years agoMerge "Add new RIL requests"
Treehugger Robot [Tue, 2 Jan 2018 22:17:21 +0000 (22:17 +0000)]
Merge "Add new RIL requests"

6 years agoFix CTS Test Dual Stack Test Passing Issue
manojboopathi [Fri, 1 Dec 2017 01:11:49 +0000 (17:11 -0800)]
Fix CTS Test Dual Stack Test Passing Issue

CTS test should fail if IPV6 Sockets is used on IPV4 address.
Unfortunately its been passing fine due to unhandled catch
exception. This is fixed in this CL.

Bug: 64435904
Test: Ran CTS test to verify ./run_cts.sh
Change-Id: I369c1b5baaa64b64feaa3f298e61f46d1200ea17

6 years agoMerge "Relax Instant Apps Settings whitelist enforcement"
Treehugger Robot [Tue, 2 Jan 2018 20:53:25 +0000 (20:53 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement"

6 years agoAvoid NPE when missing underlyingCaps.
Jeff Sharkey [Tue, 2 Jan 2018 18:46:32 +0000 (11:46 -0700)]
Avoid NPE when missing underlyingCaps.

Test: builds, boots
Bug: 70391265
Change-Id: I0f3d3f96596eca3455bcbb29af04c8b34cb18d38

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB"
Treehugger Robot [Thu, 28 Dec 2017 22:07:25 +0000 (22:07 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB"

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp"
Treehugger Robot [Thu, 28 Dec 2017 18:32:51 +0000 (18:32 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp"

6 years agoMerge "Added AIDL for cell identity"
Treehugger Robot [Thu, 28 Dec 2017 18:17:34 +0000 (18:17 +0000)]
Merge "Added AIDL for cell identity"

6 years agoMerge "Fix temporary file name strlcpy size."
Ivan Lozano [Thu, 28 Dec 2017 17:48:50 +0000 (17:48 +0000)]
Merge "Fix temporary file name strlcpy size."

6 years agoDisable sanitizer entirely in ResourceTypes.cpp
Ivan Lozano [Tue, 7 Nov 2017 21:26:27 +0000 (13:26 -0800)]
Disable sanitizer entirely in ResourceTypes.cpp

The unsigned integer overflow sanitizer catches an overflow on
Res_GETPACKAGE usages. This is used in a number of places in
ResourceTypes.cpp in a number of large functions. For now, lets disable
the sanitizer in this source file.

Test: Compiles and device boots without runtime errors.
Bug: 30969751
Change-Id: Id9e0776ef819c895a3194a32da5c85459f1af431
Merged-In: Id9e0776ef819c895a3194a32da5c85459f1af431
(cherry picked from commit 02828740da7481a48e7872b22213047025894525)

6 years agoAdded AIDL for cell identity
Jack Yu [Thu, 28 Dec 2017 00:19:20 +0000 (16:19 -0800)]
Added AIDL for cell identity

Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Merged-In: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
(cherry picked from commit 31db18a4c078b77f011170a27eb95c94398efde6)

6 years agoAccount: Fix the risk of sqliteconnection leak
chengang [Wed, 27 Dec 2017 09:17:32 +0000 (17:17 +0800)]
Account: Fix the risk of sqliteconnection leak

Fix the risk of sqliteconnection leak in accountmanagerservice

Bug: 71334517

Change-Id: I92a7381bceb5885f57cc46e686cf2581b5355df9
Signed-off-by: yuanhao <yuanhao@xiaomi.com>
6 years agoMove Ims related settings from global setting to subscription db.
Malcolm Chen [Tue, 26 Sep 2017 21:45:40 +0000 (14:45 -0700)]
Move Ims related settings from global setting to subscription db.

Bug: 66699661
Test: Manual

Change-Id: Id0d7795401f120b6a8704304a368d926a6610395
Merged-In: Id0d7795401f120b6a8704304a368d926a6610395

6 years agoAdd ICCID_PREFIX column in CarridId DB
sqian [Thu, 30 Nov 2017 19:26:56 +0000 (11:26 -0800)]
Add ICCID_PREFIX column in CarridId DB

Bug: 64131637
Test: Treehugger runs providers/telephony/CarrierIdProviderTest.java

Change-Id: I0d118ab181dfe17a7976a0b654989a3662594d4a
Merged-In: I0d118ab181dfe17a7976a0b654989a3662594d4a
(cherry picked from commit 4fe8280dc6736ab3c59f8e384323c26212215a90)

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
Treehugger Robot [Wed, 27 Dec 2017 21:22:02 +0000 (21:22 +0000)]
Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions"

6 years agoMerge "Remove getIntWithSubId in TelephonyManager."
Treehugger Robot [Wed, 27 Dec 2017 21:06:32 +0000 (21:06 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager."

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death"
Treehugger Robot [Wed, 27 Dec 2017 20:08:25 +0000 (20:08 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death"

6 years agoBinder: Log a histogram of binder proxies to logcat on death
Andreas Gampe [Wed, 27 Dec 2017 17:30:45 +0000 (09:30 -0800)]
Binder: Log a histogram of binder proxies to logcat on death

To help investigate potential BinderProxy leaks, attempt to log a
histogram of BinderProxy descriptors to the logcat before asserting.

Bug: 71353150
Test: m
Change-Id: I47313814160678369b15e7dc5851d8096c286b9d

6 years agoModify getting of primary storage size
hj.seo [Wed, 20 Dec 2017 00:39:47 +0000 (09:39 +0900)]
Modify getting of primary storage size

Settings application shows internal storage size using API getTotalBytes in StorageStatsManager.
This API calls getPrimaryStorageSize() in StorageManager.
getPrimaryStorageSize() returns /data parition size calculated API roundStorageSize() in FileUtils.
Using this API, total primary storage size returns 8GB if 16GB emmc size device has /data partition size below 8GB.
So we should modify getting of primary storage size close to real emmc size.
getPrimaryStorageSize() will be calculated sum of /data and /system partition size.

Test: Check primary storage size in Settings application

Change-Id: I3ad33534b1c55d09afbb0e9be1c408c02c442842
Signed-off-by: hj.seo <hj.seo@lge.com>
6 years agoRelax Instant Apps Settings whitelist enforcement
Chad Brubaker [Sun, 24 Dec 2017 04:06:44 +0000 (20:06 -0800)]
Relax Instant Apps Settings whitelist enforcement

The strict whitelist of settings for Instant Apps is leading to too much
unintended breakage, remove the enforcement until better infrastructure
can be added to make sure settings that should be whitelisted are.

Bug: 71009655
Test: Coming in a follow up
Change-Id: Ie089dc26cec87207515d15ba881e1a0aa49a9c51

6 years agoRemove getIntWithSubId in TelephonyManager.
Malcolm Chen [Fri, 28 Jul 2017 18:49:29 +0000 (11:49 -0700)]
Remove getIntWithSubId in TelephonyManager.

For multi-SIM case, getIntWithSubId would check if a Global.Settings
value doesn't exist for a specific SIM (for example mobile_data0),
it copies value from general one (mobile_data).

Test: Telephony unittests
Bug: 34351475
Change-Id: I870e6f3c193cf3bdeae22fe1a750b0a0ec782f9b
Merged-In: I870e6f3c193cf3bdeae22fe1a750b0a0ec782f9b

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences."
Treehugger Robot [Sat, 23 Dec 2017 00:41:49 +0000 (00:41 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."

6 years agoAdd MetricsEvent ENUMS for "Mobile network" preferences.
Malcolm Chen [Tue, 25 Jul 2017 22:48:44 +0000 (15:48 -0700)]
Add MetricsEvent ENUMS for "Mobile network" preferences.

Bug: 34775714
Test: Manual
Change-Id: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
Merged-In: I71645de4f07d10c6c3772a6fef119dbdec2db8ef

6 years agoRemove hashing for PII in Telecom Logging
Brad Ebinger [Fri, 22 Dec 2017 21:45:27 +0000 (13:45 -0800)]
Remove hashing for PII in Telecom Logging

Replaces the MD5 hash for logging PII in
Telecom with "***" instead.

Test: Manual
Bug: 67823981
Change-Id: Ieb089fe806663062a551ce7b9071e8b8f5fa9af7

6 years agoMerge "Expose the scan API and network select API."
Ying Xu [Fri, 22 Dec 2017 01:01:09 +0000 (01:01 +0000)]
Merge "Expose the scan API and network select API."

6 years agoMerge "Add feature flag and EMBMS bug fixes"
Hall Liu [Fri, 22 Dec 2017 00:37:31 +0000 (00:37 +0000)]
Merge "Add feature flag and EMBMS bug fixes"

6 years agoMerge "Add new reason code for call barring"
Brad Ebinger [Thu, 21 Dec 2017 23:45:01 +0000 (23:45 +0000)]
Merge "Add new reason code for call barring"

6 years agoMerge "Add feature flag for RTT in call log"
Hall Liu [Thu, 21 Dec 2017 22:31:45 +0000 (22:31 +0000)]
Merge "Add feature flag for RTT in call log"

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
Treehugger Robot [Thu, 21 Dec 2017 21:56:10 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"

6 years agoExpose a new public column network_type_bitmask and deprecate
Cassie [Tue, 5 Dec 2017 21:34:33 +0000 (13:34 -0800)]
Expose a new public column network_type_bitmask and deprecate
bearer_bitmask gradually.

Bug: 21276001
Test: Basic telephony sanity
Change-Id: I2896ba64959863d19c98af3e656d4c7e7b4f8d16

6 years agoMerge "Add asn1 to platform."
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:01:40 +0000 (21:01 +0000)]
Merge "Add asn1 to platform."

6 years agoRequire that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions
goneil [Thu, 14 Dec 2017 00:20:35 +0000 (16:20 -0800)]
Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions

Bug: 70177947
Test: None
Merged-In:If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
Change-Id: Ie08e56c9409c1fbbe24133b0981f5ab35f6a2f24

6 years agoAdd new RIL requests
yinxu [Mon, 20 Nov 2017 23:26:06 +0000 (15:26 -0800)]
Add new RIL requests

Bug: 68998818
Test: Basic telephony sanity
Change-Id: Icad4ad8a9d8dd1bdc36a3e073cf14db31f590929

6 years agoMerge "Add logging and disconnect reason for null connections."
Tyler Gunn [Thu, 21 Dec 2017 19:39:32 +0000 (19:39 +0000)]
Merge "Add logging and disconnect reason for null connections."

6 years agoAdd asn1 to platform.
Holly Jiuyu Sun [Mon, 11 Dec 2017 21:28:03 +0000 (13:28 -0800)]
Add asn1 to platform.

Add unit test.

Bug: 38206971
Test: unit test
Change-Id: I140b74b6bda263a4044aaed7265de3c77d1adc63
Merged-In: Ifb7c7d13ad0f980ba986b3aa6c3213ad26658489

6 years agoMerge "SMS over IMS APIs revision"
abdalkader [Thu, 21 Dec 2017 18:12:07 +0000 (18:12 +0000)]
Merge "SMS over IMS APIs revision"

6 years agoMerge "Add Notification Flag behavior test"
Treehugger Robot [Thu, 21 Dec 2017 17:54:34 +0000 (17:54 +0000)]
Merge "Add Notification Flag behavior test"

6 years agoFix temporary file name strlcpy size.
Ivan Lozano [Fri, 15 Dec 2017 03:03:56 +0000 (19:03 -0800)]
Fix temporary file name strlcpy size.

The strlcpy size argument overflows on integer sanitized builds.

 runtime error: unsigned integer overflow: 11 - 35 cannot be represented
 in type 'unsigned long'

This doesn't cause a problem because strlcpy stops on the null in
TMP_FILE_PATTERN, and localTmpFileName is defined large enough to
contain TMP_FILE_PATTERN.

This changes the size argument to the remaining length in the buffer,
and removes an extraneous '/' write as TMP_FILE_PATTERN already begins
with '/'.

Bug: 30969751
Test: Reran CTS test which triggered the overflow.

Change-Id: I20b5deeaaa1a863324dfd1d94f3135920eae48d3
Merged-In: I20b5deeaaa1a863324dfd1d94f3135920eae48d2
(cherry picked from commit 62fc14894b32f35641ae2b61ef7ed054c9660288)

6 years agoMerge "Fix random systemui crashes during cts test DO NOT MERGE"
Treehugger Robot [Thu, 21 Dec 2017 15:27:44 +0000 (15:27 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"

6 years agoMerge "Testables lib should not statically link mockito"
Treehugger Robot [Thu, 21 Dec 2017 15:27:23 +0000 (15:27 +0000)]
Merge "Testables lib should not statically link mockito"

6 years agoFix random systemui crashes during cts test DO NOT MERGE
Chrison.chai [Wed, 15 Nov 2017 01:31:26 +0000 (09:31 +0800)]
Fix random systemui crashes during cts test DO NOT MERGE

    systemui may crash due
    to an uninitialized value of mNavigationBar probably because
    of some race condition during initialization caused by emulation
    performance issues:

    11-01 19:48:58.634  5064  5064 E AndroidRuntime: FATAL EXCEPTION: main
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: Process: com.android.systemui, PID: 5064
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.android.systemui.statusbar.phone.LightBarTransitionsController.dump (java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[])' on a null object reference
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.LightBarController.dump(LightBarController.java:241)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.StatusBar.dump(StatusBar.java:3448)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at com.android.systemui.SystemBars.dump(SystemBars.java:48)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at com.android.systemui.SystemUIService.dump(SystemUIService.java:52)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at android.app.ActivityThread.handleDumpService(ActivityThread.java:3488)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at android.app.ActivityThread.-wrap9(Unknown Source:0)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at android.app.ActivityThread.handleMessage(ActivityThread.java:1726)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6541)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at com.android.internal.os.Zygote.run(Zygote.java:240)
    11-01 19:48:58.634  5064  5064 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:767)

    This patches adds an explicit checks for (mNavigationBar != null)
    everywhere it is used.

    Test: cts test.

Change-Id: I8056aef54a10bbb1970bc2ce4913e7a618498fd3

6 years agoSMS over IMS APIs revision
Brad Ebinger [Wed, 29 Nov 2017 03:15:47 +0000 (19:15 -0800)]
SMS over IMS APIs revision

- Move from being a feature to being a capability
- Move format to the constructor and make final
- Initial hooking up of APIs provided by platform for ims providers.
- Add constants for send status result
- Rename SmsListener callbacks.
- Split acknowledgeSms for sms and sms reports.
- Add reason for onSendSmsResult
Bug: 69846044

Test: None
Change-Id: I861664264a117d5483e392d4aabff59bfaf4373e

6 years agoTestables lib should not statically link mockito
Philip P. Moltmann [Wed, 20 Dec 2017 23:41:32 +0000 (15:41 -0800)]
Testables lib should not statically link mockito

- All users of the lib already statically link mockito
- We should allow the users to decide what flavor they use

Test: m -j checkbuild
Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6
Merged-In: Ibbdb8be8022432a13b872865ade47b92b28976c6