Makoto Onuki
ced94c8a6a
Merge "Fix slow query log." into qt-dev am: dee07f5d7f am: 231b70ce96
...
am: f5053e7a0d
Change-Id: I96e48d61b6a2c98ad30a0760466fe6ffe9007b9c
2019-06-04 20:26:44 -07:00
Hongyi Zhang
f5363321f0
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641 am: 887d09db5f
...
am: a3790b9a35
Change-Id: I8ccd5f250cf165e2e1a041c58296ae895efd73db
2019-06-04 20:19:45 -07:00
Victor Hsieh
c0c0e0cea4
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662 am: 6ebd3bf5e8
...
am: 71cd9d6671
Change-Id: I26226aa007bfa1126e0a4ba4870549b98646db89
2019-06-04 20:06:27 -07:00
Brad Ebinger
a62010acfd
Merge "Switch DDS during MSIM emergency call"
2019-06-05 02:30:42 +00:00
Makoto Onuki
f5053e7a0d
Merge "Fix slow query log." into qt-dev am: dee07f5d7f
...
am: 231b70ce96
Change-Id: Ia45192af629f2bd695b8c21240e7935bfd7220c5
2019-06-04 19:13:33 -07:00
Hongyi Zhang
a3790b9a35
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev am: a1d0453641
...
am: 887d09db5f
Change-Id: Id100676b439dc4e15063adc9d7822d89f352c86f
2019-06-04 19:11:09 -07:00
Victor Hsieh
71cd9d6671
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662
...
am: 6ebd3bf5e8
Change-Id: Ie135ad897405c56175719d722bd29a963e778830
2019-06-04 19:05:54 -07:00
Makoto Onuki
231b70ce96
Merge "Fix slow query log." into qt-dev
...
am: dee07f5d7f
Change-Id: If0b3a8caf1563fdcf25f8d38e3b5c6b1d183e3a2
2019-06-04 18:27:43 -07:00
Hongyi Zhang
887d09db5f
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev
...
am: a1d0453641
Change-Id: I572fa4eebc9b4597e1c7af54030d999c41184c93
2019-06-04 18:24:47 -07:00
Amin Shaikh
47ea2dabec
Merge "Update themed icons." into qt-r1-dev am: a1da7a4ef5
...
am: 51a92914df
Change-Id: If01a0ad08c4f593f169f0061b76518fea0ae8f8e
2019-06-04 18:20:18 -07:00
Victor Hsieh
6ebd3bf5e8
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev
...
am: 4fd5870662
Change-Id: Ia74ba2d310e67c025ca76683caa9d93d2fcefc40
2019-06-04 18:14:26 -07:00
Amin Shaikh
51a92914df
Merge "Update themed icons." into qt-r1-dev
...
am: a1da7a4ef5
Change-Id: Ifb342cf705c360e5057f09010dac416f562effa7
2019-06-04 12:56:50 -07:00
TreeHugger Robot
277082c2d8
Merge "switchUser checks INTERACT_ACROSS_USERS_FULL"
2019-06-04 19:11:31 +00:00
Makoto Onuki
dee07f5d7f
Merge "Fix slow query log." into qt-dev
2019-06-04 16:57:23 +00:00
Hongyi Zhang
a1d0453641
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev
2019-06-04 16:47:35 +00:00
TreeHugger Robot
4fd5870662
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev
2019-06-04 16:39:34 +00:00
TreeHugger Robot
a1da7a4ef5
Merge "Update themed icons." into qt-r1-dev
2019-06-04 16:30:35 +00:00
junyulai
7f87095cf2
Merge "Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: ed0f1438e0" into qt-r1-dev-plus-aosp
...
am: c4ca1f2ead
Change-Id: Ie3def4fb2e5fd98f2f3d77ecbec98bd495aadeeb
2019-06-04 09:11:07 -07:00
junyulai
f6316e7314
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: 0b0b339e8b
...
am: a2de419d58
Change-Id: If22a74559b3dd5ad0cd2dc7dd12becf2e0b1e59e
2019-06-04 09:08:35 -07:00
Android Build Merger (Role)
c4ca1f2ead
Merge "Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: ed0f1438e0" into qt-r1-dev-plus-aosp
2019-06-04 15:55:18 +00:00
junyulai
bd91e62ae1
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb
...
am: ed0f1438e0
Change-Id: I9b719ddc913dfaeab2ae13b61dc0ffe96f26b252
2019-06-04 08:54:22 -07:00
junyulai
a2de419d58
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb
...
am: 0b0b339e8b
Change-Id: I5cc209e05eb91a368c94f76efc961ba5fd2750fb
2019-06-04 08:54:19 -07:00
junyulai
0b0b339e8b
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
...
am: eabafd5ceb
Change-Id: I580b4dd2e493430e8420ca0907f9cf7d1d5a8773
2019-06-04 08:48:21 -07:00
junyulai
ed0f1438e0
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
...
am: eabafd5ceb
Change-Id: Ic3003fa5482446f361faa01aec1b709e40954173
2019-06-04 08:48:20 -07:00
TreeHugger Robot
eabafd5ceb
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
2019-06-04 15:38:18 +00:00
Ryan Mitchell
0e2fd2605a
Merge "Merge "Fix atoi build errors" into qt-dev am: 9fe4ba7a43 am: 4ab10d710e" into qt-r1-dev-plus-aosp
...
am: c859a703e7
Change-Id: I0340e87fa403a18303b0edba09980e92f51e152b
2019-06-04 08:27:04 -07:00
Ryan Mitchell
3ed1a29ad9
Merge "Fix atoi build errors" into qt-dev am: 9fe4ba7a43 am: ab3e54dc8a
...
am: af1cf99830
Change-Id: I42d487805a75d76ce2a777d08b627e1f7920187d
2019-06-04 08:25:37 -07:00
Android Build Merger (Role)
c859a703e7
Merge "Merge "Fix atoi build errors" into qt-dev am: 9fe4ba7a43 am: 4ab10d710e" into qt-r1-dev-plus-aosp
2019-06-04 15:20:34 +00:00
Ryan Mitchell
6bcb26988a
Merge "Fix atoi build errors" into qt-dev am: 9fe4ba7a43
...
am: 4ab10d710e
Change-Id: Ic2aabbd11ad77f748ba37336d221f36d9e8e5fe8
2019-06-04 08:19:39 -07:00
Ryan Mitchell
af1cf99830
Merge "Fix atoi build errors" into qt-dev am: 9fe4ba7a43
...
am: ab3e54dc8a
Change-Id: Ib51b230e98abc9e7689dc6b3d3df77d8b8219620
2019-06-04 08:19:37 -07:00
Ryan Mitchell
ab3e54dc8a
Merge "Fix atoi build errors" into qt-dev
...
am: 9fe4ba7a43
Change-Id: I9617284d09ec85c699d12045a8761b97b226b795
2019-06-04 08:14:36 -07:00
Ryan Mitchell
4ab10d710e
Merge "Fix atoi build errors" into qt-dev
...
am: 9fe4ba7a43
Change-Id: I64c88c9666c208e0e80919ea4fc3299a27d09c5b
2019-06-04 08:14:36 -07:00
TreeHugger Robot
9fe4ba7a43
Merge "Fix atoi build errors" into qt-dev
2019-06-04 15:06:08 +00:00
Alan Stokes
9933872808
Merge "Cleanup background activity starts for release. am: 9e2457622a am: 2447bb6e8e" into qt-r1-dev-plus-aosp
...
am: 045c80c429
Change-Id: I82ff956682f193a661ab72afb485cfbe5b71351d
2019-06-04 07:57:31 -07:00
Alan Stokes
47e80c7ce1
Cleanup background activity starts for release. am: 9e2457622a am: b68ff5ab78
...
am: 6c55961af2
Change-Id: Ic12a6402226b5842f25b58fb546da46c849166ae
2019-06-04 07:53:19 -07:00
Android Build Merger (Role)
045c80c429
Merge "Cleanup background activity starts for release. am: 9e2457622a am: 2447bb6e8e" into qt-r1-dev-plus-aosp
2019-06-04 14:45:02 +00:00
Alan Stokes
6c55961af2
Cleanup background activity starts for release. am: 9e2457622a
...
am: b68ff5ab78
Change-Id: Ie28816eba7490d34b72f188bc907c309bf669287
2019-06-04 07:42:55 -07:00
Alan Stokes
235af01d1d
Cleanup background activity starts for release. am: 9e2457622a
...
am: 2447bb6e8e
Change-Id: I73cc130d58ab88d65c2b817f170c06f88f3c3a44
2019-06-04 07:42:49 -07:00
Alan Stokes
2447bb6e8e
Cleanup background activity starts for release.
...
am: 9e2457622a
Change-Id: I220c6b6f18d28ee011957da97bd5258904d09ddc
2019-06-04 07:37:59 -07:00
Alan Stokes
b68ff5ab78
Cleanup background activity starts for release.
...
am: 9e2457622a
Change-Id: I9bc0682105251e2d462859560978763032b195c2
2019-06-04 07:37:55 -07:00
Alan Stokes
9e2457622a
Cleanup background activity starts for release.
...
This removes the parts of the feature that were only needed in beta
releases:
- Toast when a start is or would be blocked.
- Configurable whitelist of exempt apps.
- Global setting to disable.
Not to be submitted until after beta 5 is cut.
Bug: 131747138
Test: atest BackgroundActivityLaunchTest
Test: atest RootWindowContainerTests
Test: atest WmTests:ActivityStarterTests
Test: atest CtsWindowManagerDeviceTestCases:ActivityStarterTests
Test: atest CtsAppTestCases:.ServiceTest
Change-Id: I3d8b9c72c8fac86b93ac57a8a1988f4133043af8
2019-06-04 14:26:00 +00:00
Steve Elliott
edf5f0f97d
Merge "Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev am: b730e36596 am: 9740abb45f" into qt-r1-dev-plus-aosp
...
am: 70f1944c11
Change-Id: Ic47bf5e7f87d7f1c52850bec6c14e339d02cd0ac
2019-06-04 06:03:43 -07:00
Steve Elliott
5120faedc6
Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev am: b730e36596 am: 47350b01b4
...
am: 70b909412c
Change-Id: Ic7e041c407824f785128add1d28e0552eb2800e1
2019-06-04 06:01:34 -07:00
Steve Elliott
f7a968b4cd
Merge "Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev am: 8b865cd7d9 am: 1ccaa61ba5" into qt-r1-dev-plus-aosp
...
am: 59a8506bb9
Change-Id: I454a1539f756faec55b6cfbd0d988706453d9c0a
2019-06-04 05:59:34 -07:00
Steve Elliott
95e64a2389
Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev am: 8b865cd7d9 am: 9482b22074
...
am: 85c69c50b1
Change-Id: Ibfb227870f346787a15e222a5f748b8b9269dcae
2019-06-04 05:57:43 -07:00
Android Build Merger (Role)
70f1944c11
Merge "Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev am: b730e36596 am: 9740abb45f" into qt-r1-dev-plus-aosp
2019-06-04 12:56:24 +00:00
Steve Elliott
70b909412c
Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev am: b730e36596
...
am: 47350b01b4
Change-Id: I33b21ae521fb3d70724b6c4f5f131f37e6dfd8e5
2019-06-04 05:55:42 -07:00
Steve Elliott
72fafe085d
Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev am: b730e36596
...
am: 9740abb45f
Change-Id: Ib441469f3b9600f8d5b77116cc1bc79f4fd12679
2019-06-04 05:55:39 -07:00
Android Build Merger (Role)
59a8506bb9
Merge "Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev am: 8b865cd7d9 am: 1ccaa61ba5" into qt-r1-dev-plus-aosp
2019-06-04 12:54:30 +00:00
Steve Elliott
a716bc6d1f
Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev am: 8b865cd7d9
...
am: 1ccaa61ba5
Change-Id: If2291c4f22414ee24e83374c85ca49407cbf7c80
2019-06-04 05:53:56 -07:00