GitLab

automerge: 20205781

* commit '20205781':
  Add configuration to control converting sms destination number

Romove hard codes about the SimcardOperatorList and NetworkOperatorList.

Bug: 18081228
Change-Id: I230816b247491977256a83e0de07e56e0a158221

This is for lmp-sprout-dev only.

Hide provider/Telephony#SUB_ID column names.

Hide SmsManager#getSubId, SmsManager#getSmsManagerForSubscriber.

Also "unlink" references to SubscriptionManager because
SubscriptionManager is being hidden for lmp-sprout-dev we can't
have @link references to SubscriptionManager.

Change-Id: I81d9fa01bba7b1fad72952134b697b57beed91ab

automerge: 5ff829bf  -s ours

* commit '5ff829bf':
  Revert "Telephony: Voice mail notification related changes"

This reverts commit 2a9a655a.

Bug: 18126828
Change-Id: I11b02c909253caa8ffa69a3dae8e11e36262c055

Change-Id: I2615c5567f8f0089c2a824d3d041ec4a36f1e293

* commit '796d3c22':
  Change to consider SIGNAL_LOST as permanenet failure only if not attached.

Bug: 18062475
Change-Id: I6c1b220fbb3cc9798419ec190e83d3eaea16ec69

automerge: 8daf2a45

* commit '8daf2a45':
  Telephony: Voice mail notification related changes

* Separate voice mail notify from SIM/RUIM card

* For GSM store voice mail count in phone memory
irrespective of SIM write result.

* Display voice mail count for GSM

Bug: 17299884

Change-Id: I368bfb98c8798ed1f43bcc330e6d97e8f95f0f54

    Change the copyright as Android.

    Review: https://partner-android-review.git.corp.google.com/#/c/185242

Change-Id: Iad9632917d14ddb429aeb08d7335aef3fe0663d8

am d86df358: Device mobile data is not working though mobile data status indicator shows "H" with full signal

* commit 'd86df358':
  Device mobile data is not working though mobile data status indicator shows "H" with full signal

* Separate voice mail notify from SIM/RUIM card

* For GSM store voice mail count in phone memory
irrespective of SIM write result.

* Display voice mail count for GSM

Bug: 17299884

Change-Id: I368bfb98c8798ed1f43bcc330e6d97e8f95f0f54

"H" with full signal

Fix: Do not merge the APN configures which have the same type element. If there
are multiple type elements in the confgures, they should be merge only if
there is no common set between them.

Bug:18080519
Change-Id: Ic3bf5979abdf1623ae57d7a9fc659f6c3005b869

Change-Id: Iaa354ddf634fa21a06eae961c7bdb5b1602e891e

Turning on the cellular radio when user selects the provisioning notification
can take 30-60s so a UI is needed to keep the user informed that the radio is
coming up.  This is only for provisioning APN support (only AT&T tablets now).

bug:15990642
Change-Id: I1e77c3a1b1a24be7acc7cb3c925c002e5fa2d1a9

* commit '9ecf9dc2':
  require DUMP permission on dump()

am f63f536e: Merge "Change apn comparison (apnsSimilar()) to make sure same APNs are merged." into lmp-dev

* commit 'f63f536e':
  Change apn comparison (apnsSimilar()) to make sure same APNs are merged.

Bug: 17983781
Change-Id: Ib8e9904da80d638abdcc74a5e183ce3d44e1e33b

Bug: 18015631
Change-Id: I590bfb04600d6f6f6b0f552713b04616bc6a3330

CatService.java: extend sInstance to support dsds

Change-Id: I47823aab90b692a2a1e3c2f57c0b658e104c1b84

New design of capability switch for L.
Add new RIL requests:
 RIL_REQUEST_GET_RADIO_CAPABILITY
 RIL_REQUEST_SET_RADIO_CAPABILITY
 RIL_UNSOL_RADIO_CAPABILITY

These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.

It can support 2/3/4G switch and has flexible architecture to support
future technology.

Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1

* commit 'cbb9298b':
  ril: Fix update screen events.

- Handle invalid states in updateScreenState.
- Call updateScreenState in onRadioAvailalbe instead.

BUG: 17991196
Change-Id: I567aa74b1dd6b4bbadb273c05296fe82be575f7f
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>

Change-Id: Ie7d4113629b6cea521465a4a4d5d147707956fff

* commit 'f17dec63':
  Fix an NPE in SubscriptionController.dump

Bug: 17945275
Change-Id: I076112ede5fd224284c23078b321fd282d0dffe0

* commit '7b960c8a':
  Hide sensitive payload from logging.

For:
RIL_REQUEST_SIM_OPEN_CHANNEL
RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL
UNSOL_STK_EVENT_NOTIFY
UNSOL_STK_PROACTIVE_COMMAND

Bug: 17984085
Change-Id: I8b83ae0d85792636bae0b7e0f57b0ea6e5cb33d9

* commit '8eb4b07b':
  Fix enabling of FailFast mechanism.

* commit '4a00d523':
  Pass in connection to CDMAPhone.notifyUnknownConnection

If you use the wrong obtainMessage it's cast into an Integer
and stored in obj instead of arg1.  This causes us to retry onto
the provisioning apn in 3 seconds instead of 20 and speeds up
the process.

bug:15990642
Change-Id: I3deb32d49c9fa77b16af9daf5c6ffb682363f6d1

An equivalent change has already been made in GSMPhone.

Bug: 17939852
Change-Id: I546618b3d56b2c855e33d8a5604478262f21514c

Conflicts:
	src/java/com/android/internal/telephony/DebugService.java
	src/java/com/android/internal/telephony/SubscriptionController.java

Change-Id: Ifa2fe56599d7f3459164def6d7291315a9afa546