Commit Graph

392883 Commits

Author SHA1 Message Date
Chris Blume
026d70ba45 Do not use both "virtual" and "override".
C++'s "override" keyword implies "virtual". When "virtual" and
"override" are both specified it means something slightly different from
just "override", which is what was intended here.

I teach the C++11 class here at Google. I asked the C++ arbitors to help
me understand this difference. They warned that it is dangerous and not
worth knowing. But that it is worth avoiding.

Test: Tested on local device -- no noticable change.
BUG=115613038

Change-Id: I372821053755fc4cbb1d001b71af7f02dffde5b2
2018-11-19 10:53:04 -08:00
Pengquan Meng
e9f5e86054 Merge "Add 5G NSA information" 2018-11-14 18:07:40 +00:00
Sudheer Shanka
c2c3d18c11 Merge "Update shared sandbox prefix to "shared-"." 2018-11-14 18:02:11 +00:00
TreeHugger Robot
24f78ddda7 Merge "WindowInsets: Fix unintentional un-nulling in legacy constructor" 2018-11-14 17:27:29 +00:00
Lucas Dupin
2280a2fb70 Merge "Update doze state when device wakes-up" 2018-11-14 17:11:19 +00:00
Bram Bonné
8c28bf54de Merge "Ports chunking/cdc from gmscore to AOSP." 2018-11-14 16:29:29 +00:00
Adrian Roos
b849386493 WindowInsets: Fix unintentional un-nulling in legacy constructor
Fixes issues arising from mistakenly turning consumed insets to zero insets
in the legacy Rect constructor.

Change-Id: Ie531fca0fba28eba25843004acfb5444ca6669cd
Fixes: 119310980
Test: atest android.view.WindowInsetsTest
2018-11-14 07:36:25 -08:00
Gus Prevas
755cc66534 Merge "Changes notification auto-demotion to use secure setting." 2018-11-14 15:10:33 +00:00
Chenjie Yu
bb0fed59fd Merge "log connectivity state change" 2018-11-14 15:02:50 +00:00
Bram Bonné
865003370b Ports chunking/cdc from gmscore to AOSP.
Some additional changes (apart from the regular style modifications)
were needed:
- Guava crypto methods are replaced by their javax equivalents.
- Preconditions checks now depend on com.android.util rather than Guava.

Bug: 111386661,116575321
Test: atest RunFrameworksServicesRoboTests
Change-Id: I43f92f1c0fb3acf62469712d8db212f94429116c
2018-11-14 14:56:45 +00:00
Ruslan Tkhakokhov
145401596c Merge "KV] Don't set current token if no data was moved" 2018-11-14 10:42:39 +00:00
TreeHugger Robot
78cad9d8f5 Merge "Fix applyAdjustmentsFromAssistants" 2018-11-14 09:23:27 +00:00
TreeHugger Robot
b8bb293e72 Merge "Use display context to inflate navbar on external display" 2018-11-14 08:35:32 +00:00
Amit Mahajan
020cf0b2d4 [automerger skipped] Merge changes from topics "getLine1Number fix", "sms_corruption", "Initial RCS CL" am: 1e8399f1ab am: 5f2441c343
am: 62f9aa44f7  -s ours

Change-Id: I2e0887aeed83b003e59e4f741ce24738e1511bfa
2018-11-14 00:11:23 -08:00
Amit Mahajan
62f9aa44f7 Merge changes from topics "getLine1Number fix", "sms_corruption", "Initial RCS CL" am: 1e8399f1ab
am: 5f2441c343

Change-Id: Ifa75e5d760ebc7f7b8aa5de6ec8f3f1002fe50ae
2018-11-13 23:48:03 -08:00
Amit Mahajan
5f2441c343 Merge changes from topics "getLine1Number fix", "sms_corruption", "Initial RCS CL"
am: 1e8399f1ab

Change-Id: Ifef9b938c88243a328c5e6de8b40c1e7bc54c6af
2018-11-13 23:33:07 -08:00
Fan Zhang
2429492504 Merge "Remove arbitrary Pair from action() logging method." 2018-11-14 07:27:14 +00:00
Amit Mahajan
1e8399f1ab Merge changes from topics "getLine1Number fix", "sms_corruption", "Initial RCS CL"
* changes:
  Define new intent ACTION_LINE1_NUMBER_ERROR_DETECTED
  Move the intent to SMS namespace for database corruption detection
  Initial RCS CL.
2018-11-14 07:17:19 +00:00
Riddle Hsu
19607774dd Use display context to inflate navbar on external display
- Disable rotation suggestion button if the navbar is on
  non-default display because there is no accelerometer sensor.
- Avoid leakage by removing navbar fragment from fragment
  host when display is removed.

Bug: 117746225
Bug: 117744614
Test: atest SystemUITests
Test: manual - create a virtual display with system decoration.
      The navbar on the virtual display should not change when
      rotating or changing density of default display.
      And after releasing the display, use command "dumpsys
      activity service com.android.systemui/.SystemUIService |
      grep NavigationBarFragment" to check the number of instances.

Change-Id: Icdc8634628ace21395b7eb9d77c6b1067850d1b2
2018-11-14 15:04:44 +08:00
Fan Zhang
f63a61d294 Remove arbitrary Pair from action() logging method.
Caller should use generic action(int, int, int, String, int) instead.

Bug: 117860032
Test: robotests
Change-Id: I4db5b9e764478bcb36ba5c96e805a929d212b344
2018-11-13 21:50:39 -08:00
Lucas Dupin
29a07ec2b2 Update doze state when device wakes-up
After the refactor, mDozing ended up being false for while until
DreamManagerService decides to end our DreamService. This ended up
delaying scrim transitions and causing display flashing.

Change-Id: I1630d1536ab0a009a5b8d13f7fb4502b5f6a4dda
Fixes: 118684623
Test: manual
Test: atest StatusBarTest
2018-11-13 20:30:11 -08:00
Chenjie Yu
ae9dfacfc1 log connectivity state change
log when networks become available and lost, for all transport types
In statsd, we can use net id to uniquely identify a network. We should
be able to count connectivity state changes similar to what BatteryStats
does.

Bug: 115561340
Test: cts test
Change-Id: Ieac4d243e27d5d368a77e5607dec51964912240d
2018-11-13 19:39:02 -08:00
Robert Shih
2823d3abdd Merge "MediaPlayer2Impl: pack source info into subclass" 2018-11-14 03:38:52 +00:00
Sudheer Shanka
9f557739e1 Merge "Update isAppStorageSandboxed to handle shell uid." 2018-11-14 02:46:50 +00:00
TreeHugger Robot
d8b71cf126 Merge "SF: Add support for boundless layers 2/2" 2018-11-14 02:35:19 +00:00
Pengquan Meng
ce1bc742f5 Add 5G NSA information
Bug: 111453000
Test: atest FrameworksTelephonyTests
Change-Id: I5392bae0bcfaf231b67134a9c01c044f94f908b5
2018-11-14 02:17:14 +00:00
Sudheer Shanka
d68bd60ccd Update shared sandbox prefix to "shared-".
":" is not allowed in filenames by vfat.

Bug: 119525489
Test: sm set-virtual-disk true
Test: atest core/tests/packagemanagertests/src/android/content/pm/KernelPackageMappingTests.java
Test: atest services/tests/servicestests/src/com/android/server/StorageManagerServiceTest.java

Change-Id: I95ef58486abe8f2a9760e0229192448e0bd9ef42
2018-11-13 18:16:36 -08:00
Sooraj Sasindran
4e3eb8084a Merge "API to switch preferred data" 2018-11-14 02:09:56 +00:00
TreeHugger Robot
c05291dc66 Merge "Bypass most session work for APEX packages" 2018-11-14 02:02:45 +00:00
Amit Mahajan
668ce6bbef Define new intent ACTION_LINE1_NUMBER_ERROR_DETECTED
Test: build
Bug: 115843312
Merged-in: Ibcc9ce533fbc6980a371eb6239a53dc9cdebb22a
Change-Id: Ibcc9ce533fbc6980a371eb6239a53dc9cdebb22a
(cherry picked from commit 1bf4e92c50)
2018-11-14 01:12:15 +00:00
Jayachandran C
32e712e0c0 Move the intent to SMS namespace for database corruption detection
Test: Simulated and verified the new intend is used
Bug: 118658558
Bug: 115990430
Merged-in: I07a58d0fe1c34106b3da85d1dfd4576b40da4bd5
Change-Id: I07a58d0fe1c34106b3da85d1dfd4576b40da4bd5
(cherry picked from commit 349b9ba16f)
2018-11-14 01:08:52 +00:00
Lucas Dupin
0e693bf2ac Merge "Fix notification icon visibility on AOD" 2018-11-14 00:57:35 +00:00
Amit Mahajan
0c081a10ad Initial RCS CL.
This CL adds RcsManager with a dummy API.

Test: build
Bug: 109759350
Merged-in: Ib10a38fac9182ca010d3895431e419f5c1958d59
Change-Id: Ib10a38fac9182ca010d3895431e419f5c1958d59
(cherry picked from commit 7d496bc030)
2018-11-14 00:46:15 +00:00
TreeHugger Robot
332849b539 Merge "Begins refactoring delete into test and execute steps" 2018-11-14 00:42:58 +00:00
Robert Shih
56f7c90c94 MediaPlayer2Impl: pack source info into subclass
Bug: 109928575
Test: android.media.cts.MediaPlayer2Test
Change-Id: Ia478b828f4fa11502f7693a530a367ff769d2881
2018-11-13 16:39:35 -08:00
TreeHugger Robot
0d3548b391 Merge "Check for null in applyDefiningSharedLibraryUpdateLocked." 2018-11-14 00:22:11 +00:00
James Lemieux
30a74c0187 Merge "Use tip-of-tree robolectric" 2018-11-14 00:05:34 +00:00
Alison Cichowlas
277ff273a4 Merge "Flag off new Chooser behavior." 2018-11-13 23:53:38 +00:00
Amit Mahajan
c82fb62e4e [automerger skipped] Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED." am: c02d53b081 am: bed2a24661 -s ours
am: 2939f3c260  -s ours

Change-Id: I6f126e38027a5cc6a4a07d94a1166369b13e7e00
2018-11-13 15:32:34 -08:00
TreeHugger Robot
b813934aef Merge "Fixes Intelligence Service location" 2018-11-13 23:25:06 +00:00
Amit Mahajan
2939f3c260 [automerger skipped] Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED." am: c02d53b081
am: bed2a24661  -s ours

Change-Id: I35e2ea4ffc686f288d573ad197324e9ae86d0d03
2018-11-13 15:18:21 -08:00
Amit Mahajan
bed2a24661 Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED."
am: c02d53b081

Change-Id: I11d0181f8fb98c00a9a1acf7818a4a31aed83cfa
2018-11-13 15:05:15 -08:00
TreeHugger Robot
09d8d5c08c Merge "Handle ANativeWindow resize with Vulkan swapchain" 2018-11-13 22:52:59 +00:00
TreeHugger Robot
a23a68d42f Merge ""None" should be translatable" 2018-11-13 22:44:21 +00:00
Andreas Gampe
f51560f73f [automerger skipped] Merge changes Idbacb6ad,I4e06b3f9,Iffcbbb82 am: 0f9a09d8ba am: e15b2d5896
am: a1974bbe6d  -s ours

Change-Id: I38117b01600df7bd71390d7a273852f39bf83676
2018-11-13 14:39:17 -08:00
TreeHugger Robot
e6472fe56d Merge "Check for null in addition to instanceof Face" 2018-11-13 22:29:57 +00:00
Andreas Gampe
a1974bbe6d Merge changes Idbacb6ad,I4e06b3f9,Iffcbbb82 am: 0f9a09d8ba
am: e15b2d5896

Change-Id: I50b0c5785656ba5561083aec8901267baee99c2a
2018-11-13 14:29:39 -08:00
TreeHugger Robot
94b33fb532 Merge "Statsd pulls on-device power measurements" 2018-11-13 22:29:27 +00:00
Amit Mahajan
c02d53b081 Merge "Adding new intent ACTION_SMS_MMS_DB_CREATED." 2018-11-13 22:22:30 +00:00
Andreas Gampe
e15b2d5896 Merge changes Idbacb6ad,I4e06b3f9,Iffcbbb82
am: 0f9a09d8ba

Change-Id: Ifb62e924d1ad57ba0cf0ed1130a61819154a2312
2018-11-13 14:19:04 -08:00