Commit Graph

343445 Commits

Author SHA1 Message Date
goneil
f220cdfca4 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
am: ee48176ad6

Change-Id: I831efeddbebd4ff65d2a64f628eab84f84ecfa73
2017-12-27 21:31:21 +00:00
Treehugger Robot
ee48176ad6 Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" 2017-12-27 21:22:02 +00:00
Malcolm Chen
c7cebc8e8e Merge "Remove getIntWithSubId in TelephonyManager."
am: 10d1ee58f8

Change-Id: I6ddf4fa541650ed9c983bd21d7e3eacf80214285
2017-12-27 21:15:31 +00:00
Treehugger Robot
10d1ee58f8 Merge "Remove getIntWithSubId in TelephonyManager." 2017-12-27 21:06:32 +00:00
Andreas Gampe
3c57709e70 Merge "Binder: Log a histogram of binder proxies to logcat on death"
am: 4b7abe301c

Change-Id: I8f29f452707bb38799877f23d0d04152619c81cb
2017-12-27 20:18:25 +00:00
Treehugger Robot
4b7abe301c Merge "Binder: Log a histogram of binder proxies to logcat on death" 2017-12-27 20:08:25 +00:00
Andreas Gampe
3fc030f083 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
2017-12-27 09:30:45 -08:00
Malcolm Chen
675839f0fa Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."
am: e4e5291743

Change-Id: I504256eb76a94002678832ecb13a6ef12f7d3603
2017-12-23 00:50:25 +00:00
Malcolm Chen
ccc427426f 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
2017-12-23 00:45:35 +00:00
Treehugger Robot
e4e5291743 Merge "Add MetricsEvent ENUMS for "Mobile network" preferences." 2017-12-23 00:41:49 +00:00
Malcolm Chen
917b51fda7 Add MetricsEvent ENUMS for "Mobile network" preferences.
Bug: 34775714
Test: Manual
Change-Id: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
Merged-In: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
2017-12-22 23:18:59 +00:00
Ying Xu
a9083c3145 Merge "Expose the scan API and network select API."
am: 761b7b50d1

Change-Id: I6cdbcea874ba58874dcfe47da9866b25643a1a96
2017-12-22 01:09:23 +00:00
Ying Xu
761b7b50d1 Merge "Expose the scan API and network select API." 2017-12-22 01:01:09 +00:00
Hall Liu
3424136a59 Merge "Add feature flag and EMBMS bug fixes"
am: 465f2916e0

Change-Id: I0a590d86b2e39ba77a013ceb2c0d6b6582ef1ae4
2017-12-22 00:48:39 +00:00
Hall Liu
465f2916e0 Merge "Add feature flag and EMBMS bug fixes" 2017-12-22 00:37:31 +00:00
Brad Ebinger
ddf31e1810 Merge "Add new reason code for call barring"
am: a003d996b9

Change-Id: I36fd5803e1a1a535a000dc4e69dc7238fa26efbd
2017-12-21 23:53:13 +00:00
Brad Ebinger
a003d996b9 Merge "Add new reason code for call barring" 2017-12-21 23:45:01 +00:00
Hall Liu
9a5e663d97 Merge "Add feature flag for RTT in call log"
am: 138d07f82d

Change-Id: Id04b93ecd8cd25f59354fe209cb98c05248afaa8
2017-12-21 22:40:11 +00:00
Hall Liu
138d07f82d Merge "Add feature flag for RTT in call log" 2017-12-21 22:31:45 +00:00
Hansong Zhang
d6c2722094 Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
am: 045fdae1b3

Change-Id: I8f7a28ce56435bd4d1f01631b188a62f35c3f100
2017-12-21 22:08:20 +00:00
Treehugger Robot
045fdae1b3 Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" 2017-12-21 21:56:10 +00:00
Holly Jiuyu Sun
ea1d85d484 Merge "Add asn1 to platform."
am: bdd0da8fa7

Change-Id: Ic34f9bd45e7fb46bae2afe5be0cc453d87b276bd
2017-12-21 21:19:28 +00:00
Holly Jiuyu Sun
bdd0da8fa7 Merge "Add asn1 to platform." 2017-12-21 21:01:40 +00:00
goneil
d75e242fb8 Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions
Bug: 70177947
Test: None
Merged-In:If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
Change-Id: Ie08e56c9409c1fbbe24133b0981f5ab35f6a2f24
2017-12-21 12:55:41 -08:00
Tyler Gunn
c840efcf7e Merge "Add logging and disconnect reason for null connections."
am: 7661e81f85

Change-Id: Id1f754f62869c38499f30d6ee33046c89024efc6
2017-12-21 20:00:28 +00:00
Tyler Gunn
7661e81f85 Merge "Add logging and disconnect reason for null connections." 2017-12-21 19:39:32 +00:00
abdalkader
f9eba1a18f Merge "SMS over IMS APIs revision"
am: 2bf7f03e63

Change-Id: I7296426e1c1fc903d92e324a09598e357e75389b
2017-12-21 19:20:36 +00:00
Yan Sun
dee5f9a738 Merge "Add Notification Flag behavior test"
am: 89bb1971d0

Change-Id: I0948f245fee622b5acd1a1bb414e7a2e20090dc8
2017-12-21 19:17:32 +00:00
Chrison.chai
e9940be86d Merge "Fix random systemui crashes during cts test DO NOT MERGE"
am: d8514e82aa  -s ours

Change-Id: Ib0b5affb287771dfc965ebe0a05791849aa919c8
2017-12-21 19:14:40 +00:00
Philip P. Moltmann
b42cd23425 Merge "Testables lib should not statically link mockito"
am: 47d04fc5c0

Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688
2017-12-21 19:12:57 +00:00
Holly Jiuyu Sun
a2b23916c0 Add asn1 to platform.
Add unit test.

Bug: 38206971
Test: unit test
Change-Id: I140b74b6bda263a4044aaed7265de3c77d1adc63
Merged-In: Ifb7c7d13ad0f980ba986b3aa6c3213ad26658489
2017-12-21 10:39:26 -08:00
abdalkader
2bf7f03e63 Merge "SMS over IMS APIs revision" 2017-12-21 18:12:07 +00:00
Treehugger Robot
89bb1971d0 Merge "Add Notification Flag behavior test" 2017-12-21 17:54:34 +00:00
Sanket Padawe
151c15445a Merge "Receiving side Call handover API implementation."
am: 3c7bc2dc06

Change-Id: I7badcfaf9d308fb05745b0f37ee99603f5eee1c2
2017-12-21 17:41:40 +00:00
Chenbo Feng
fa7f4015fc Merge "Use NetworkStatsService to get stats for apps"
am: 693d8a2ab1

Change-Id: I81a28a172e69fc405e99eb9c3a4fd0c729ca613d
2017-12-21 17:38:12 +00:00
Treehugger Robot
d8514e82aa Merge "Fix random systemui crashes during cts test DO NOT MERGE" 2017-12-21 15:27:44 +00:00
Treehugger Robot
47d04fc5c0 Merge "Testables lib should not statically link mockito" 2017-12-21 15:27:23 +00:00
Chrison.chai
2aa5a9df8a 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
2017-12-21 14:06:16 +00:00
Brad Ebinger
b2a83cfcfc 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
2017-12-20 17:18:50 -08:00
Philip P. Moltmann
56ff021d50 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
2017-12-20 15:41:32 -08:00
Sanket Padawe
3c7bc2dc06 Merge "Receiving side Call handover API implementation." 2017-12-20 21:54:38 +00:00
Treehugger Robot
693d8a2ab1 Merge "Use NetworkStatsService to get stats for apps" 2017-12-20 20:30:54 +00:00
Hansong Zhang
b06bb2186a BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)
Bug: 63384609
Test: make
Merged-In: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb
Change-Id: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb
(cherry picked from commit 42324278bf)
2017-12-20 11:10:53 -08:00
Philip P. Moltmann
cf7aa7c09e Merge "Don't include mockito in frameworks-base-testutils"
am: f924642729

Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7
2017-12-20 19:09:03 +00:00
Treehugger Robot
f924642729 Merge "Don't include mockito in frameworks-base-testutils" 2017-12-20 18:55:14 +00:00
Benedict Wong
5949912523 Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
am: 4edb4c8ec4

Change-Id: I75a3cb9e9d9d7d3b6c0ede86074a00ddcd86028e
2017-12-20 18:35:45 +00:00
Benedict Wong
4edb4c8ec4 Merge "[ipsec-doze] Add fchown to IpSecService to support doze" 2017-12-20 18:25:32 +00:00
Sanket Padawe
02d8c276d9 Receiving side Call handover API implementation.
Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#Bug:

Change-Id: Ic0c4af19098252389648007628affc19a44f89dd
Merged-in: Ic0c4af19098252389648007628affc19a44f89dd
2017-12-20 10:13:05 -08:00
Sanket Padawe
9053309827 Merge "Implement Call handover initiation side APIs."
am: e2d080481a

Change-Id: Ib9840c4ce4abf64f36e21cbc3256050e4216314b
2017-12-20 17:41:13 +00:00
Sanket Padawe
e2d080481a Merge "Implement Call handover initiation side APIs." 2017-12-20 17:33:45 +00:00