2 years agoMerge "Allow fallback translated languages in MccTable"
Maurice Lam [Tue, 14 Mar 2017 01:46:39 +0000]
Merge "Allow fallback translated languages in MccTable"

2 years agoMerge "Removed the deprecated screen state API" am: ff8c0eb673 am: 138dbcd141
Jack Yu [Tue, 14 Mar 2017 00:51:05 +0000]
Merge "Removed the deprecated screen state API" am: ff8c0eb673 am: 138dbcd141
am: 5565a9ade0

Change-Id: I74268078119650fdcba7adb5ea2bf59949d28367

2 years agoMerge "Removed the deprecated screen state API" am: ff8c0eb673
Jack Yu [Tue, 14 Mar 2017 00:46:34 +0000]
Merge "Removed the deprecated screen state API" am: ff8c0eb673
am: 138dbcd141

Change-Id: I14e4f7f27d37f4d3758a5957789dd6e39404a51a

2 years agoMerge "Removed the deprecated screen state API"
Jack Yu [Tue, 14 Mar 2017 00:41:05 +0000]
Merge "Removed the deprecated screen state API"
am: ff8c0eb673

Change-Id: I33bbd6334e468ab49d605a3143112516fff443e9

2 years agoMerge "Removed the deprecated screen state API"
Jack Yu [Tue, 14 Mar 2017 00:34:02 +0000]
Merge "Removed the deprecated screen state API"

2 years agoMerge "Remove old @Postsubmit annotation" am: 4e9fbe1ab3 am: 86f57e1afd
Jordan Liu [Tue, 14 Mar 2017 00:09:04 +0000]
Merge "Remove old @Postsubmit annotation" am: 4e9fbe1ab3 am: 86f57e1afd
am: cfb5d38706  -s ours

Change-Id: I813409b23da3ce528c403c98bc349a946ee7322f

2 years agoMerge "Remove old @Postsubmit annotation" am: 4e9fbe1ab3
Jordan Liu [Tue, 14 Mar 2017 00:04:05 +0000]
Merge "Remove old @Postsubmit annotation" am: 4e9fbe1ab3
am: 86f57e1afd

Change-Id: I797039b385ffd2156157aab565654e915d972e1e

2 years agoMerge "Remove old @Postsubmit annotation"
Jordan Liu [Mon, 13 Mar 2017 23:59:33 +0000]
Merge "Remove old @Postsubmit annotation"
am: 4e9fbe1ab3

Change-Id: I6ffe4c05cabf94df974c35e117fa275d40d854a2

2 years agoMerge "Remove old @Postsubmit annotation"
Jordan Liu [Mon, 13 Mar 2017 23:52:54 +0000]
Merge "Remove old @Postsubmit annotation"

2 years agoMerge "[DO NOT MERGE] Update injectSmsPdu documentation." am: 1ccbc720bf -s ours...
ashastry [Mon, 13 Mar 2017 23:37:58 +0000]
Merge "[DO NOT MERGE] Update injectSmsPdu documentation." am: 1ccbc720bf  -s ours am: 708dcb021c  -s ours
am: 241190bf9e  -s ours

Change-Id: I93321bdbe308f8f30d184b0c5ece55b07e5e072a

2 years agoMerge "[DO NOT MERGE] Update injectSmsPdu documentation." am: 1ccbc720bf -s ours
ashastry [Mon, 13 Mar 2017 23:32:27 +0000]
Merge "[DO NOT MERGE] Update injectSmsPdu documentation." am: 1ccbc720bf  -s ours
am: 708dcb021c  -s ours

Change-Id: I6f9d02c62e4111965497481d5e7aa8ae649bfa09

2 years agoMerge "[DO NOT MERGE] Update injectSmsPdu documentation."
ashastry [Mon, 13 Mar 2017 23:27:56 +0000]
Merge "[DO NOT MERGE] Update injectSmsPdu documentation."
am: 1ccbc720bf  -s ours

Change-Id: I4ab30e0ba684fd47846e2424fe7e6c0309502a87

2 years agoMerge "[DO NOT MERGE] Update injectSmsPdu documentation."
ashastry [Mon, 13 Mar 2017 23:22:24 +0000]
Merge "[DO NOT MERGE] Update injectSmsPdu documentation."

2 years agoRemoved the deprecated screen state API
Jack Yu [Mon, 13 Mar 2017 22:22:01 +0000]
Removed the deprecated screen state API

The screen state API was deprecated on O and should
not be added into the radio interace.

Test: Telephony sanity tests
bug: 32223897
Change-Id: I6651224779399d7c33a3675ac8cc3ca004bcd549

2 years agoMerge "Change to not send error response twice." am: 10a430b59c am: f3983ed4f9
Amit Mahajan [Mon, 13 Mar 2017 22:12:38 +0000]
Merge "Change to not send error response twice." am: 10a430b59c am: f3983ed4f9
am: e4257b591a

Change-Id: I312632bd84e3219e91c3baed9159be794f261096

2 years agoMerge "Change to not send error response twice." am: 10a430b59c
Amit Mahajan [Mon, 13 Mar 2017 22:08:09 +0000]
Merge "Change to not send error response twice." am: 10a430b59c
am: f3983ed4f9

Change-Id: I7aea65ef496af4d0668965794935a2dacf610138

2 years agoMerge "Change to not send error response twice."
Amit Mahajan [Mon, 13 Mar 2017 22:04:11 +0000]
Merge "Change to not send error response twice."
am: 10a430b59c

Change-Id: Ie365b5d6a75443d496e2ee302bceb0edc5af7da4

2 years agoMerge "Change to not send error response twice."
Treehugger Robot [Mon, 13 Mar 2017 21:58:28 +0000]
Merge "Change to not send error response twice."

2 years ago[DO NOT MERGE] Update injectSmsPdu documentation.
Abhijith Shastry [Fri, 3 Mar 2017 18:28:17 +0000]
[DO NOT MERGE] Update injectSmsPdu documentation.

BUG: 35325136
Test: Comment only update.
Change-Id: Id60409f66fd9166a2ad9c46d9be0e8f2c52fdb33

2 years agoMerge "Fix phone process crash due to stale data processing." am: 6e2e2c1d6a am:...
Sandeep Gutta [Fri, 10 Mar 2017 19:55:19 +0000]
Merge "Fix phone process crash due to stale data processing." am: 6e2e2c1d6a am: fbbb45db70
am: bd40e81b9a

Change-Id: I909fa3fd42dde6c984209ba461e0eec360b165ae

2 years agoMerge "Fix phone process crash due to stale data processing." am: 6e2e2c1d6a
Sandeep Gutta [Fri, 10 Mar 2017 19:51:47 +0000]
Merge "Fix phone process crash due to stale data processing." am: 6e2e2c1d6a
am: fbbb45db70

Change-Id: I6df7d67a2d377362ec057b5b34181b93816de48e

2 years agoMerge "Fix phone process crash due to stale data processing."
Sandeep Gutta [Fri, 10 Mar 2017 19:48:17 +0000]
Merge "Fix phone process crash due to stale data processing."
am: 6e2e2c1d6a

Change-Id: I8b991e22de0b5c29b9d978c6e3f1331a74359873

2 years agoMerge "Fix phone process crash due to stale data processing."
Treehugger Robot [Fri, 10 Mar 2017 19:43:39 +0000]
Merge "Fix phone process crash due to stale data processing."

2 years agoMerge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt...
Shuo Qian [Fri, 10 Mar 2017 18:06:40 +0000]
Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt/telephony" am: d6ca792e51 am: 8ae4207385
am: 29bc303d1a

Change-Id: I7a026b36f7ba53375fe1d345c4c6a0f7d656662d

2 years agoMerge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt...
Shuo Qian [Fri, 10 Mar 2017 18:04:10 +0000]
Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt/telephony" am: d6ca792e51
am: 8ae4207385

Change-Id: Ia49e65eab2a199b6b8c1fdb92eeb7dec08953368

2 years agoFix phone process crash due to stale data processing.
Sandeep Gutta [Mon, 4 Jul 2016 14:03:22 +0000]
Fix phone process crash due to stale data processing.

Due to successive power down and power up happening in
quick successions, CommandParamsFactory is processing
the older data even after CatService is disposed, resulting
in the phone process crash.

Fix: Add a null check for icon loader in CommandParamsFactory
to avoid the crash.
Test: verified no crash.

Bug: 30928365
Change-Id: Ia011cec83f53e764d2c201dd0bd588eb5a4c7e89

2 years agoMerge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt...
Shuo Qian [Fri, 10 Mar 2017 18:01:10 +0000]
Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt/telephony"
am: d6ca792e51

Change-Id: Id6b4acbd3bf06e8ef07fe7af6e80065b61c5ec2e

2 years agoMerge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt...
Shuo Qian [Fri, 10 Mar 2017 17:56:26 +0000]
Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt/telephony"

2 years agoMerge "Refactor code incompatible with Mockito 2.7.13" am: 92851f849f am: fe9742f910
Paul Duffin [Fri, 10 Mar 2017 07:46:34 +0000]
Merge "Refactor code incompatible with Mockito 2.7.13" am: 92851f849f am: fe9742f910
am: fbf9f1ee39

Change-Id: I1bbea7a6b6812993a454f53d0aa2c2fecb4e0050

2 years agoMerge "Refactor code incompatible with Mockito 2.7.13" am: 92851f849f
Paul Duffin [Fri, 10 Mar 2017 07:43:02 +0000]
Merge "Refactor code incompatible with Mockito 2.7.13" am: 92851f849f
am: fe9742f910

Change-Id: I75eaa6c1878560051938baa9caafe3e88e84c855

2 years agoMerge "Refactor code incompatible with Mockito 2.7.13"
Paul Duffin [Fri, 10 Mar 2017 07:39:33 +0000]
Merge "Refactor code incompatible with Mockito 2.7.13"
am: 92851f849f

Change-Id: I1c60aa1fb298acb1c46d40686a8f30c018216ebd

2 years agoMerge "Refactor code incompatible with Mockito 2.7.13"
Paul Duffin [Fri, 10 Mar 2017 07:33:55 +0000]
Merge "Refactor code incompatible with Mockito 2.7.13"

2 years agoMerge "Use tac and ci as lac and cid for LTE" am: 995e90e58b am: 8b075e719b
Sooraj Sasindran [Fri, 10 Mar 2017 03:17:17 +0000]
Merge "Use tac and ci as lac and cid for LTE" am: 995e90e58b am: 8b075e719b
am: 7cdecadae4

Change-Id: I0310395b98c7d1bd7dd5285b0a81a94d29eff0ca

2 years agoMerge "Use tac and ci as lac and cid for LTE" am: 995e90e58b
Sooraj Sasindran [Fri, 10 Mar 2017 03:12:45 +0000]
Merge "Use tac and ci as lac and cid for LTE" am: 995e90e58b
am: 8b075e719b

Change-Id: I39fd8857fc8d8b9e4d413e69c17d67a49f36e8e8

2 years agoMerge "Use tac and ci as lac and cid for LTE"
Sooraj Sasindran [Fri, 10 Mar 2017 03:10:17 +0000]
Merge "Use tac and ci as lac and cid for LTE"
am: 995e90e58b

Change-Id: I3ce8719f7f0105ddee1f6b4c9821eac86df1c3d1

2 years agoMerge "Use tac and ci as lac and cid for LTE"
Sooraj Sasindran [Fri, 10 Mar 2017 03:05:18 +0000]
Merge "Use tac and ci as lac and cid for LTE"

2 years agoChange to not send error response twice.
Amit Mahajan [Fri, 10 Mar 2017 01:42:28 +0000]
Change to not send error response twice.

resetProxyAndRequestList() sends the error response.
Also includes fixes for OemHookProxy handling when service dies.

Test: Basic telephony sanity
Bug: 35910123
Change-Id: I23d4b3495523ba0a5bc5fe619b525a2d1fbba5f4

2 years agoRemove old @Postsubmit annotation
Jordan Liu [Wed, 1 Mar 2017 18:03:01 +0000]
Remove old @Postsubmit annotation

The annotation is no longer needed because it has been replaced with
@FlakyTest. This commit also removes the import.

Change-Id: I5e7c1a7b6a856f84f294f98acb4ba627fc7880cd
Merged-In: I5e7c1a7b6a856f84f294f98acb4ba627fc7880cd
Fixes: 35710737
Test: No change to behavior

2 years agoMerge "Disable a phone number log for user build" am: 58046e21d7 am: 7ca693cd1f
Brad Ebinger [Fri, 10 Mar 2017 00:03:32 +0000]
Merge "Disable a phone number log for user build" am: 58046e21d7 am: 7ca693cd1f
am: 4052128b60

Change-Id: I452f19d4b640f0505662b4cfd2ccc6c9cd1fc082

2 years agoRemove @FlakyTest annotation for TelephonyMetricsTest.java
Shuoq [Thu, 9 Mar 2017 22:13:11 +0000]
Remove @FlakyTest annotation for TelephonyMetricsTest.java
in framework/opt/telephony

Bug: 35710737
Test: Sanity
Change-Id: I2e80f8658ae981835d46f0e449faa4713f74cf12

2 years agoMerge "Disable a phone number log for user build" am: 58046e21d7
Brad Ebinger [Thu, 9 Mar 2017 21:52:17 +0000]
Merge "Disable a phone number log for user build" am: 58046e21d7
am: 7ca693cd1f

Change-Id: Iec6b64c4dcca11a3c0874847a807881a3402cb51

2 years agoMerge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony" am: e47a6...
Shuo Qian [Thu, 9 Mar 2017 21:52:17 +0000]
Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony" am: e47a6f23e0 am: f6bcac2003
am: 70efe0babc

Change-Id: Idf294ba3a5a8333244cd0839e8f48b1060dafb64

2 years agoMerge "Initialize CallForwardInfo correctly." am: 579e3ca02d am: 48ea88541d
Amit Mahajan [Thu, 9 Mar 2017 21:52:04 +0000]
Merge "Initialize CallForwardInfo correctly." am: 579e3ca02d am: 48ea88541d
am: afe2aed0c7

Change-Id: I09f406bd7434e1c32aa7b20960a6be925822a3f4

2 years agoMerge "Disable a phone number log for user build"
Brad Ebinger [Thu, 9 Mar 2017 21:45:44 +0000]
Merge "Disable a phone number log for user build"
am: 58046e21d7

Change-Id: I86a10997b063328b9b5e92cc07f031abb0a291a4

2 years agoMerge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony" am: e47a6...
Shuo Qian [Thu, 9 Mar 2017 21:44:02 +0000]
Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony" am: e47a6f23e0
am: f6bcac2003

Change-Id: I6fa45003fee7f8aacd7d2ddeb28befc49f2438f6

2 years agoMerge "Initialize CallForwardInfo correctly." am: 579e3ca02d
Amit Mahajan [Thu, 9 Mar 2017 21:42:11 +0000]
Merge "Initialize CallForwardInfo correctly." am: 579e3ca02d
am: 48ea88541d

Change-Id: I7898c9ce1353c71c8f2ed0a6bef034c6ce356d3a

2 years agoMerge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"
Shuo Qian [Thu, 9 Mar 2017 21:41:36 +0000]
Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"
am: e47a6f23e0

Change-Id: I4a643fe842c72995cbb05cf5c08e9d79f5814ed4

2 years agoMerge "Disable a phone number log for user build"
Brad Ebinger [Thu, 9 Mar 2017 21:38:59 +0000]
Merge "Disable a phone number log for user build"

2 years agoMerge "Initialize CallForwardInfo correctly."
Amit Mahajan [Thu, 9 Mar 2017 21:38:52 +0000]
Merge "Initialize CallForwardInfo correctly."
am: 579e3ca02d

Change-Id: I9c0c3efd2cf6a3473ba50de2bb1dc9d60c8d8826

2 years agoMerge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"
Shuo Qian [Thu, 9 Mar 2017 21:38:39 +0000]
Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"

2 years agoMerge "Initialize CallForwardInfo correctly."
Treehugger Robot [Thu, 9 Mar 2017 21:33:23 +0000]
Merge "Initialize CallForwardInfo correctly."

2 years agoRefactor code incompatible with Mockito 2.7.13
Paul Duffin [Thu, 9 Mar 2017 18:49:41 +0000]
Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: Ie5ac742d4376e96286cc527a2331e91a17c85fd8

2 years agoInitialize CallForwardInfo correctly.
Amit Mahajan [Thu, 9 Mar 2017 20:10:17 +0000]
Initialize CallForwardInfo correctly.

Test: *#21# on AT&T shows response
Bug: 35330178
Change-Id: I624f7799d1289dca41dfd56870bbbd7b0cbee48a

2 years agoMerge "Revert "Get rid of RIL version."" am: 6514905475 am: cd7b721ab6
Adrian Salido [Thu, 9 Mar 2017 20:10:14 +0000]
Merge "Revert "Get rid of RIL version."" am: 6514905475 am: cd7b721ab6
am: c39906967f

Change-Id: I55dac4d7ee85fb890d8b08c22ffe6bf7c8835cb3

2 years agoMerge "Revert "Get rid of RIL version."" am: 6514905475
Adrian Salido [Thu, 9 Mar 2017 20:07:14 +0000]
Merge "Revert "Get rid of RIL version."" am: 6514905475
am: cd7b721ab6

Change-Id: I3cf021d0f7a2ca00cb94f87d0e4aa1bf69cf63ba

2 years agoMerge "Revert "Get rid of RIL version.""
Adrian Salido [Thu, 9 Mar 2017 20:05:14 +0000]
Merge "Revert "Get rid of RIL version.""
am: 6514905475

Change-Id: I14f1c448e55cedfb09f7af2e73daffd8d5ca1e5d

2 years agoAdd @FlakyTest annotation to flaky tests in framework/opt/telephony
Shuoq [Tue, 7 Mar 2017 23:37:02 +0000]
Add @FlakyTest annotation to flaky tests in framework/opt/telephony

Bug: 35710737
Test: No change to behavior
Change-Id: I923486c5fb69b241cea59a330ed80077c10adb89

2 years agoMerge "Revert "Get rid of RIL version.""
Treehugger Robot [Thu, 9 Mar 2017 19:56:55 +0000]
Merge "Revert "Get rid of RIL version.""

2 years agoUse tac and ci as lac and cid for LTE
Sooraj Sasindran [Tue, 7 Mar 2017 07:01:31 +0000]
Use tac and ci as lac and cid for LTE

In case of LTE, use ci and tac as cid and lac.
Convert ril registration state to ServiceState
registration state.

Test: verified unit tests.
      verified on device that device reports
      registration correctly
Bug=32223344
Change-Id: I556914dc17dae3842048fc574e5554ef26264720

2 years agoRevert "Get rid of RIL version."
Adrian Salido [Thu, 9 Mar 2017 01:17:28 +0000]
Revert "Get rid of RIL version."

This reverts commit 81ea341d2deb767cbd1de2f356296ad92e951c52.

Bug: 36018228
Change-Id: Iee0410f197c2869e2bdefcaaae51e7ef215cdff1

2 years agoMerge "Change Czech Republic to Czechia" am: d6d57139c6 am: e9add841a9
Joachim Sauer [Wed, 8 Mar 2017 20:12:56 +0000]
Merge "Change Czech Republic to Czechia" am: d6d57139c6 am: e9add841a9
am: 38cba8a0fc

Change-Id: I1c22eb2b24f78685bd9603a6332dc581757e1239

2 years agoMerge "Makes some updates to the ImsService Rebind process" am: ff78a98356 am: 680888a9e6
Brad Ebinger [Wed, 8 Mar 2017 20:11:08 +0000]
Merge "Makes some updates to the ImsService Rebind process" am: ff78a98356 am: 680888a9e6
am: f423e81078

Change-Id: I4d07daf2a9c8ccd01af1ea7994d4316432c64562

2 years agoMerge "Change Czech Republic to Czechia" am: d6d57139c6
Joachim Sauer [Wed, 8 Mar 2017 20:08:55 +0000]
Merge "Change Czech Republic to Czechia" am: d6d57139c6
am: e9add841a9

Change-Id: Id94ff92f8a771bff0d6bf19a4794e4812c3d1c43

2 years agoMerge "Change Czech Republic to Czechia"
Joachim Sauer [Wed, 8 Mar 2017 20:07:43 +0000]
Merge "Change Czech Republic to Czechia"
am: d6d57139c6

Change-Id: Ibed6118f29f1f26c9d41d7084c4e6b8ca088ca1e

2 years agoMerge "Makes some updates to the ImsService Rebind process" am: ff78a98356
Brad Ebinger [Wed, 8 Mar 2017 20:06:31 +0000]
Merge "Makes some updates to the ImsService Rebind process" am: ff78a98356
am: 680888a9e6

Change-Id: Ieaa225f219f72b3ef8ad8adf8b01c96f84dacca4

2 years agoMerge "Change Czech Republic to Czechia"
Treehugger Robot [Wed, 8 Mar 2017 20:02:36 +0000]
Merge "Change Czech Republic to Czechia"

2 years agoMerge "Makes some updates to the ImsService Rebind process"
Brad Ebinger [Wed, 8 Mar 2017 20:02:09 +0000]
Merge "Makes some updates to the ImsService Rebind process"
am: ff78a98356

Change-Id: If7c3ea006d99a488188cffc63c490eab09bac577

2 years agoMerge "Makes some updates to the ImsService Rebind process"
Brad Ebinger [Wed, 8 Mar 2017 19:53:25 +0000]
Merge "Makes some updates to the ImsService Rebind process"

2 years agoChange Czech Republic to Czechia
Joachim Sauer [Wed, 8 Mar 2017 18:06:37 +0000]
Change Czech Republic to Czechia

This commit only contains changes to comments.

Bug: 34964100
Test: m buildcheck
Change-Id: I0e8ab86c613ba647545da288da0078f785fdc1f1

2 years agoMerge "Wait for CS Call End Reason before finishing the call session"
TreeHugger Robot [Wed, 8 Mar 2017 00:24:23 +0000]
Merge "Wait for CS Call End Reason before finishing the call session"

2 years agoAllow fallback translated languages in MccTable
Maurice Lam [Wed, 16 Nov 2016 03:03:15 +0000]
Allow fallback translated languages in MccTable

When choosing a fallback locale, if that locale is marked as
"translated" by LocaleStore, return that locale. This is true if a
locale itself has translations, or another locale with the same
language and script that is translated.

For example if the user inserts a Canadian SIM, previously it will
fallback to en-US since the system doesn't have translations for
en-CA. But since Android N users are allowed to select locale
English (Canada), which the framework will find suitable fallback
translation when resolving resources. So with this change, if the
user inserts a Canadian SIM, getLocaleFromMcc will now return en-CA.

Test: Run MccTableTest (via adb shell am instrument)
Bug: 31395257
Change-Id: I7f74bc2ed14efb9ce5594dbf563c76e2d5b353da

2 years agoWait for CS Call End Reason before finishing the call session
Naveen Kalla [Sun, 5 Mar 2017 05:25:17 +0000]
Wait for CS Call End Reason before finishing the call session

For CS Calls, Phone state changes to IDLE as soon as call ends
but the disconnect reason is received after that. Wait for
the call end reason for all the calls before finishing the
call session. Enhance the print message with call session
information when TelephonyMetrics are dumped

Test: Make CS Calls and check logs to make sure call session
      is finished after Call End reason is obtained in
      TelephonyMetrics. Run "adb shell dumpsys activity service
      TelephonyDebugService --metrics" and ensure that the
      dump contains calls session information (call states and
      end reason)

Change-Id: I3e88b52ed170bc1fde04965ad87192ed6c5143ff

2 years agoMerge "Fixed database not closed after use" am: a8b56a378b am: 8928b4bb62
Jack Yu [Tue, 7 Mar 2017 17:16:30 +0000]
Merge "Fixed database not closed after use" am: a8b56a378b am: 8928b4bb62
am: 89aa950f86

Change-Id: I910b6d98618a85351654c91e3fc07e981aa3dd67

2 years agoMerge "Fixed database not closed after use" am: a8b56a378b
Jack Yu [Tue, 7 Mar 2017 17:13:58 +0000]
Merge "Fixed database not closed after use" am: a8b56a378b
am: 8928b4bb62

Change-Id: Iefbf69dcd9b85921acf8326253d994b14bccdf16

2 years agoMerge "Fixed database not closed after use"
Jack Yu [Tue, 7 Mar 2017 17:11:59 +0000]
Merge "Fixed database not closed after use"
am: a8b56a378b

Change-Id: Ibdc403e9a504dc6a3cc2627bb8e064138a8ab2a8

2 years agoMerge "Fixed database not closed after use"
Treehugger Robot [Tue, 7 Mar 2017 17:07:39 +0000]
Merge "Fixed database not closed after use"

2 years agoMerge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest" am:...
Erik Kline [Tue, 7 Mar 2017 13:42:16 +0000]
Merge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest" am: 079277986d am: e68d80a102
am: a126780901

Change-Id: If51c68abb987b3554b97dfbf225a6ef51800521f

2 years agoMerge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest" am:...
Erik Kline [Tue, 7 Mar 2017 13:38:11 +0000]
Merge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest" am: 079277986d
am: e68d80a102

Change-Id: I7549c377d25bb72ea920f486275174f475367e59

2 years agoMerge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"
Erik Kline [Tue, 7 Mar 2017 13:32:33 +0000]
Merge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"
am: 079277986d

Change-Id: Ic25bf55b79899dc26180f62ab51910d415d5d82b

2 years agoMerge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"
Treehugger Robot [Tue, 7 Mar 2017 13:27:09 +0000]
Merge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"

2 years agoRemove request{LinkProperties,NetworkCapabilities} by NetworkRequest
Erik Kline [Tue, 7 Mar 2017 08:14:59 +0000]
Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest

Test: treehugger
Bug: 32163131
Change-Id: Idbc6ad949540c62d7db727f52d93fcd8fda694d8

2 years agoMerge "Delete unused code." am: 223446daad am: b13048d245
Amit Mahajan [Tue, 7 Mar 2017 02:42:53 +0000]
Merge "Delete unused code." am: 223446daad am: b13048d245
am: a628440ba2

Change-Id: Ib4a08493df401d99bdb70dc712bb176bafa5b9bb

2 years agoMerge "Delete unused code." am: 223446daad
Amit Mahajan [Tue, 7 Mar 2017 02:40:52 +0000]
Merge "Delete unused code." am: 223446daad
am: b13048d245

Change-Id: I955dc330ed50f04268eff79a434712858b444623

2 years agoMerge "Delete unused code."
Amit Mahajan [Tue, 7 Mar 2017 02:38:53 +0000]
Merge "Delete unused code."
am: 223446daad

Change-Id: I225ff7c59f08c93259816f2595ed58b96cb5b305

2 years agoMerge "Fixed enableLocationUpdates crash" am: 663db0d09b am: 66b6faeae1
Jack Yu [Tue, 7 Mar 2017 01:05:35 +0000]
Merge "Fixed enableLocationUpdates crash" am: 663db0d09b am: 66b6faeae1
am: e243c82c68

Change-Id: I28c7194f55cd01c6bbd11b5d2038d08b86e47f51

2 years agoMerge "Fixed enableLocationUpdates crash" am: 663db0d09b
Jack Yu [Tue, 7 Mar 2017 01:03:36 +0000]
Merge "Fixed enableLocationUpdates crash" am: 663db0d09b
am: 66b6faeae1

Change-Id: I4a24c052bcfd327e073826fe5eadb60ecefafbff

2 years agoMerge "Fixed enableLocationUpdates crash"
Jack Yu [Tue, 7 Mar 2017 01:01:05 +0000]
Merge "Fixed enableLocationUpdates crash"
am: 663db0d09b

Change-Id: Ic9e7a4dfdac9d19cee4ca2b3c4a9b5c9783cc092

2 years agoFixed database not closed after use
Jack Yu [Sun, 5 Mar 2017 04:20:52 +0000]
Fixed database not closed after use

Test: Telephony sanity tests
bug:

Change-Id: Ifb8f058bef78810ad21c038a1abc97e3be2f0713

2 years agoMerge "Revert "Add the frameworks/services dependency to frameworks/opt""
TreeHugger Robot [Mon, 6 Mar 2017 23:34:00 +0000]
Merge "Revert "Add the frameworks/services dependency to frameworks/opt""

2 years agoMerge "Delete unused code."
Treehugger Robot [Mon, 6 Mar 2017 23:13:13 +0000]
Merge "Delete unused code."

2 years agoRevert "Add the frameworks/services dependency to frameworks/opt"
Nathan Harold [Mon, 6 Mar 2017 21:29:25 +0000]
Revert "Add the frameworks/services dependency to frameworks/opt"

This reverts commit fafffe1a47bdfecb23e33ea610966dd3103ce782.

Bug: 203414389
Test: compilation aosp_sailfish, aosp_fugu
Change-Id: I6965b04f022fd6eb762831d50a8fbbd48432022d

2 years agoMerge "Fixed enableLocationUpdates crash"
Treehugger Robot [Mon, 6 Mar 2017 22:01:12 +0000]
Merge "Fixed enableLocationUpdates crash"

2 years agoMerge "Read the voice message count properly" am: f131beed5f am: df760f5d0b
Umashankar Godachi [Mon, 6 Mar 2017 21:57:54 +0000]
Merge "Read the voice message count properly" am: f131beed5f am: df760f5d0b
am: f2416f6134

Change-Id: I545d840ab7938f922c0c266afb75da46ac36014d

2 years agoMerge "Read the voice message count properly" am: f131beed5f
Umashankar Godachi [Mon, 6 Mar 2017 21:55:54 +0000]
Merge "Read the voice message count properly" am: f131beed5f
am: df760f5d0b

Change-Id: I0f62a17eb296ae035390cc3d4de74051b5fc6a07

2 years agoMerge "Read the voice message count properly"
Umashankar Godachi [Mon, 6 Mar 2017 21:53:54 +0000]
Merge "Read the voice message count properly"
am: f131beed5f

Change-Id: Ic94440abc9b0c60885ddc0e822fb2bbc5ffc863c

2 years agoMerge "Read the voice message count properly"
Treehugger Robot [Mon, 6 Mar 2017 20:10:50 +0000]
Merge "Read the voice message count properly"

2 years agoFixed enableLocationUpdates crash
Jack Yu [Sun, 5 Mar 2017 16:52:42 +0000]
Fixed enableLocationUpdates crash

1. The EVENT_GET_LOC_DONE handler dit not handle the
   new voice registration response properly. This is a
   regression introduced in ag/1907337.

2. Make ServiceStateTracker unit tests passed again!
   Fixed a regression introduced by the Trebel change ag/1750738.
   Return value of EVENT_RESTRICTED_STATE_CHANGED now is an integer
   instead of an integer array.

Test: Telephony sanity tests
bug: 35980759
Change-Id: Idcacc4c891950913172be00daa966e7eb5be7fa6

2 years agoDisable a phone number log for user build
Shunta Sakai [Tue, 6 Dec 2016 11:59:55 +0000]
Disable a phone number log for user build

A phone number is privacy data. Therefore, it should be prevented
from logging in user build.

Co-Author: xuegang.x.liu <xuegang.x.liu@sonymobile.com>
Co-Author: kei.x.ueda <kei.x.ueda@sonymobile.com>

Test: manual - checked log
Bug: 34582911
Change-Id: Ia1d33d43cf69de8b429ea243d988e275d81f1062

2 years agoMerge "Fixed DeviceStateMonitor unit tests" am: 09b4cd2c63 am: 3df7326f33
Jack Yu [Sun, 5 Mar 2017 18:42:49 +0000]
Merge "Fixed DeviceStateMonitor unit tests" am: 09b4cd2c63 am: 3df7326f33
am: 99048c3bc4

Change-Id: I5ffd3f58e920ec44eebf77aa1e6662e70e548d84

2 years agoMerge "Fixed DeviceStateMonitor unit tests" am: 09b4cd2c63
Jack Yu [Sun, 5 Mar 2017 18:39:18 +0000]
Merge "Fixed DeviceStateMonitor unit tests" am: 09b4cd2c63
am: 3df7326f33

Change-Id: I5200f46e917a7fa75dc79b080db5fd0cce964a3e