350443 Commits

Author SHA1 Message Date
TreeHugger Robot
54c43f46fc Merge "Make native AudioRouting Handler in a seperate class." 2017-11-30 18:17:55 +00:00
Mohamed
cf6e63b4db Merge "Add SMS over IMS APIs" am: 74445ed311 am: 208f232825
am: 09d8a996e0

Change-Id: I0c49f42e220aed34c6bb4801ae80e29aeea329eb
2017-11-30 16:34:15 +00:00
Nadav Bar
108e94d9b0 Merge "Enabled the use of VOICE_DOWNLINK, VOICE_UPLINK and VOICE_CALL as audio sources for AudioRecord (Only supported for system apps)" 2017-11-30 16:28:17 +00:00
Christine Franks
e5d74ccc30 Merge "Promote ACTION_DISMISS_TIMER to public API" 2017-11-30 16:23:46 +00:00
Mohamed
09d8a996e0 Merge "Add SMS over IMS APIs" am: 74445ed311
am: 208f232825

Change-Id: If9b5427292eaa41b6381351c57ec5cad4b6bc4a1
2017-11-30 16:15:58 +00:00
Mohamed
208f232825 Merge "Add SMS over IMS APIs"
am: 74445ed311

Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913
2017-11-30 16:05:36 +00:00
Treehugger Robot
74445ed311 Merge "Add SMS over IMS APIs" 2017-11-30 15:56:30 +00:00
TreeHugger Robot
e9634c5c26 Merge "Remove unused repackaged-legacy-test target" 2017-11-30 15:03:50 +00:00
Lenka Trochtova
031a2f1aaf Make DevicePolicyManagerService more customizable (per-device).
Add a config to override the DPMS implementation class to
be instantiated from the Lifecycle.
Add a hasFeature method to the Injector class.

BUG: 63753860
Test: manual with TestDPC

Change-Id: I71ef518c49b2233744defdfb7c31019cb228d678
2017-11-30 10:27:35 +01:00
Chenjie Yu
05013b3772 add atoms and pulling methods for wifi controller activity and modem
controller activity

Test: manual test on device
Change-Id: Ib4213b4bf8badaf22b5f655e0261f45a55ab6bb7
2017-11-30 06:54:54 +00:00
TreeHugger Robot
9789f090a3 Merge "Add a phony target containing benchmarks for PGO" 2017-11-30 06:35:29 +00:00
TreeHugger Robot
f9d7ec5cf3 Merge "Modify statsd dogfood app to use toString() of enum" 2017-11-30 05:59:39 +00:00
Tej Singh
77068c43e7 Modify statsd dogfood app to use toString() of enum
Using this reduces code size and allows us to not have to
make a change whenever atoms.proto changes.

Test: manual, tested app on device

Change-Id: Ieb325a7a7bab7430273340bb9d05974fabbadc0d
2017-11-29 19:33:08 -08:00
TreeHugger Robot
304494b61d Merge "Fix cross-user content resolver tests." 2017-11-30 03:21:06 +00:00
Chih-hung Hsieh
11823b744b Merge "Use -Werror in frameworks/base/media/mca/filterfw" am: 171fce8377 am: cba4979a6a
am: f5005c6356

Change-Id: Icb467de821ecd700daae687341dc9116c065cdf5
2017-11-30 02:58:20 +00:00
TreeHugger Robot
3b1b282528 Merge "AAPT2: Fix overzealous AndroidManifest fully qualified class names" 2017-11-30 02:51:46 +00:00
Chih-hung Hsieh
f5005c6356 Merge "Use -Werror in frameworks/base/media/mca/filterfw" am: 171fce8377
am: cba4979a6a

Change-Id: Ifea0bcb3e48a83ba21c24026d95819f4f947d039
2017-11-30 02:27:13 +00:00
TreeHugger Robot
b5126d94a2 Merge "Add metric for battery page in debug mode." 2017-11-30 02:19:22 +00:00
Chih-hung Hsieh
cba4979a6a Merge "Use -Werror in frameworks/base/media/mca/filterfw"
am: 171fce8377

Change-Id: I698ee4b4d6c884469253238795d23bdb21a54542
2017-11-30 02:19:13 +00:00
TreeHugger Robot
7bdde7ec42 Merge "Use system dialog corner radius" 2017-11-30 02:16:23 +00:00
Wale Ogunwale
9f3d06b78a Merge "Don't start recents multiple times when entering split-screen" 2017-11-30 02:04:01 +00:00
Chih-hung Hsieh
171fce8377 Merge "Use -Werror in frameworks/base/media/mca/filterfw" 2017-11-30 01:55:47 +00:00
TreeHugger Robot
a3dcd16044 Merge "ImageReader: Make discardFreeBuffers public" 2017-11-30 01:28:59 +00:00
Fyodor Kupolov
46d88da64e Merge "Remove shutdown of StorageManager" 2017-11-30 01:18:20 +00:00
TreeHugger Robot
0044cfd9da Merge "Adds guardrail for memory usage for statsd uid map." 2017-11-30 01:16:54 +00:00
TreeHugger Robot
0efb119dd8 Merge "Don't fail the tests if per-freq cpu times are not available." 2017-11-30 01:13:23 +00:00
TreeHugger Robot
8e181791ae Merge "TextClassifier cleanup #1" 2017-11-30 01:07:29 +00:00
Dmitry Dementyev
b9cb8b3397 Merge "Make libkeystore_aidl shared and export to PDK." 2017-11-30 01:05:42 +00:00
TreeHugger Robot
2973e8ce15 Merge "Update nav bar controller to allow for a home intent to be fired without having a package name." 2017-11-30 00:57:07 +00:00
Adam Lesinski
23034b911c AAPT2: Fix overzealous AndroidManifest fully qualified class names
ManifestFixer would go and fully qualify all elements with the attribute
'android:name', which is not correct, especially for cases like

  <uses-split android:name="foo" />

Test: make aapt2_tests
Change-Id: I4bea2550d0025179d2d48dca8c64e0cbf4451e99
2017-11-29 16:29:08 -08:00
Pengquan Meng
b414149cec Merge "fixed CdmaSmsAddress parser" am: b00f00e74b am: c8ec8a5e56
am: 3ca2c2dab8

Change-Id: Ie28175cc6946f4e53069895c0ea9f28634b9a96f
2017-11-30 00:26:13 +00:00
Mohamed
037749df03 Add SMS over IMS APIs
- Adds public APIs that IMS providers will implement/use
- Adds aidl APIs for internal communications to support SMS over IMS.
- First pass at documentation of APIs.

Moving over from  ag/3265442

Bug: 69846044

Test: None
Change-Id: Ic665a2a7d64a56417bcf2a159d6b88b05cdb832a
2017-11-29 16:14:57 -08:00
Sudheer Shanka
ce247f2721 Merge "Temporarily disable the netpolicy unit tests." 2017-11-30 00:12:14 +00:00
TreeHugger Robot
be9249742e Merge changes Ie479be5b,I299245fc
* changes:
  Fix if clauses
  Update error text
2017-11-30 00:11:00 +00:00
Pengquan Meng
3ca2c2dab8 Merge "fixed CdmaSmsAddress parser" am: b00f00e74b
am: c8ec8a5e56

Change-Id: Id3830aaea1037b61ecc385715708427c84030206
2017-11-30 00:10:02 +00:00
Pengquan Meng
c8ec8a5e56 Merge "fixed CdmaSmsAddress parser"
am: b00f00e74b

Change-Id: I041c8f3937882b7fd78adf2c2f2cf87fc225b936
2017-11-29 23:52:41 +00:00
TreeHugger Robot
fb19b383bf Merge "Fix horizontal position of tooltip in a Dialog" 2017-11-29 23:51:38 +00:00
Pengquan Meng
b00f00e74b Merge "fixed CdmaSmsAddress parser" 2017-11-29 23:38:29 +00:00
TreeHugger Robot
4d2ec90742 Merge "Measure the text before doing line break" 2017-11-29 23:35:12 +00:00
Sudheer Shanka
1706bcddd5 Fix cross-user content resolver tests.
Wait for the user to get unlocked before trying to start an
encryption-unaware app in that user.

Fixes: 69927817
Test: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w
      com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I36f38d20c7f4584a68bc3b1b99941ce3e3b3815c
2017-11-29 15:25:59 -08:00
jiabin
9070e29586 Make native AudioRouting Handler in a seperate class.
Bug: 64038649
Test: runtest --path cts/tests/tests/media/src/android/media/cts/RoutingTest.java
Change-Id: I2fc64e177797b2541ba8652d54827f08fd6ca216
2017-11-29 15:20:44 -08:00
Jiuyu Sun
577e400902 Merge "Confirmation code second try." 2017-11-29 23:12:08 +00:00
Lucas Dupin
e95a425a7a Merge "Make face unlock icon use correct theme attr" 2017-11-29 23:04:53 +00:00
Jeff Sharkey
9952370286 Merge "Add build targets to build @SystemApi diffs." 2017-11-29 23:01:50 +00:00
David Chen
c136f45aee Adds guardrail for memory usage for statsd uid map.
Checks if current memory usage of uid map is above a configured limit
and if so, we start deleting snapshots. If there are no more
snapshots, we begin deleting two of the deltas. Also records stats
in the guardrail StatsdStats. Also fixes an edge case where a config
is added after the snapshots are added. We request a snapshot of all
installed uid's at that moment. Finally, adds the uid map memory size
when determining if we should send a broadcast to trigger collection.

Test: Added unit-tests and check they pass on marlin.
Change-Id: Id5d86378bd1efe12a06b409164c777c0c6f4e3ab
2017-11-29 14:55:15 -08:00
Brad Stenning
f2f0979b76 Update nav bar controller to allow for a home intent to be fired without
having a package name.

Test: After set up select the Lenspicker as the home app then click the
  home button (note: needs other commits with topic "AAE Home"

Change-Id: Ief9871bcc81902036d7af9630d6f1d27e8c83366
(cherry picked from commit Icddda312c10dfd603fb098fec13dae55d807444e)
# Conflicts:
#	packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java
2017-11-29 22:53:20 +00:00
Chih-Hung Hsieh
a7ea11e316 Use -Werror in frameworks/base/media/mca/filterfw
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I12137a0b40357954af63bac3771332773b03da9a
2017-11-29 14:52:36 -08:00
TreeHugger Robot
b1b1141ee4 Merge "WebView: linkify ClientCertRequest method names" 2017-11-29 22:41:19 +00:00
Dmitry Dementyev
319a5c11e5 Make libkeystore_aidl shared and export to PDK.
Bug: 69539820
Test: manual
Change-Id: Iff47e9247fbc2217a2c70a35bbc6c72075af63bb
2017-11-29 14:24:49 -08:00
TreeHugger Robot
22b94c3f0f Merge "Fix text encoding in some macrobench tests" 2017-11-29 22:19:07 +00:00