Commit Graph

386527 Commits

Author SHA1 Message Date
Andreas Gampe
ff647f505b Merge "Update boot image profile to include Object.wait()" am: ba0b212a33 am: 0d68d68b39
am: 4af76de6da

Change-Id: Ibd56ba7fd9ef20dd94072aa8f22235f22d56cbf6
2018-09-18 23:09:59 -07:00
Nan Zhang
4881262573 Merge "Enable jdiff for api-stubs-docs" am: 61d0ec49ef am: f886bc1a94
am: aab7836c24

Change-Id: Id4dc90a8d4c3cf5c8231676df6c1db69d56050bd
2018-09-18 23:02:26 -07:00
Chienyuan
425da18f9f [automerger skipped] Merge "Simplify logic for getConnectionStatus in HidDeviceProfile" am: b545c70d1d am: f374663b3a
am: 08cab972f6  -s ours

Change-Id: I8d67dd43bb605fcf319b5713af481e43ae88c02e
2018-09-18 22:55:56 -07:00
Andreas Gampe
4af76de6da Merge "Update boot image profile to include Object.wait()" am: ba0b212a33
am: 0d68d68b39

Change-Id: Ic49e46c6930729c12673177d0ba29d15e47e6168
2018-09-18 22:40:42 -07:00
Nan Zhang
aab7836c24 Merge "Enable jdiff for api-stubs-docs" am: 61d0ec49ef
am: f886bc1a94

Change-Id: I43ef41ee14d0ba434a5783f9b3daf944f30bd542
2018-09-18 22:33:50 -07:00
Chienyuan
96c2323bcb [automerger skipped] Merge "Simplify logic for connect in MapClientProfile" am: 0ac2a840a0 am: e7374ba2c7
am: f9c56d0aea  -s ours

Change-Id: Iac09e4c684648cb8ea001c48cc64066e6d305e13
2018-09-18 22:29:36 -07:00
Chienyuan
08cab972f6 Merge "Simplify logic for getConnectionStatus in HidDeviceProfile" am: b545c70d1d
am: f374663b3a

Change-Id: I977d3acb03ab828f66657afab3ba36a96de88893
2018-09-18 22:25:21 -07:00
Andreas Gampe
0d68d68b39 Merge "Update boot image profile to include Object.wait()"
am: ba0b212a33

Change-Id: I70bdeb6326a5f1eaa531f9eaad3ab90175eb8622
2018-09-18 22:20:56 -07:00
Chienyuan
f9c56d0aea Merge "Simplify logic for connect in MapClientProfile" am: 0ac2a840a0
am: e7374ba2c7

Change-Id: I1b45c319378904de15b82e28ed2340df79de11d1
2018-09-18 22:20:12 -07:00
Nan Zhang
f886bc1a94 Merge "Enable jdiff for api-stubs-docs"
am: 61d0ec49ef

Change-Id: I0eae62d725ddefa6ef719b8d34eb1ca9eb8a7b41
2018-09-18 22:15:43 -07:00
Chienyuan
f374663b3a Merge "Simplify logic for getConnectionStatus in HidDeviceProfile"
am: b545c70d1d

Change-Id: I6b876ae488809fd84e5c399fda2b5d7c3abfc8ae
2018-09-18 22:11:48 -07:00
Chienyuan
e7374ba2c7 Merge "Simplify logic for connect in MapClientProfile"
am: 0ac2a840a0

Change-Id: Ibd99ec5998fc81b302235912076f5df153b5d8ba
2018-09-18 22:08:48 -07:00
TreeHugger Robot
0b13665626 Merge "Fix style errors in inputMethodClientHasFocus()" 2018-09-19 04:33:03 +00:00
Treehugger Robot
ba0b212a33 Merge "Update boot image profile to include Object.wait()" 2018-09-19 03:10:37 +00:00
Treehugger Robot
61d0ec49ef Merge "Enable jdiff for api-stubs-docs" 2018-09-19 03:02:19 +00:00
Tony Huang
b3e5edd5ea Merge "Fix ExternalStorageProvider always throw exception when rename" 2018-09-19 02:56:00 +00:00
TreeHugger Robot
9165f58f94 Merge "Simplify logic for connect in PbapClientProfile" 2018-09-19 02:42:36 +00:00
Philip P. Moltmann
fa894222e6 Revert "Reduce coupling between DefaultPermissionGrantPolicy and PM"
This reverts commit 47e8820816.

Reason for revert: 115854330

Bug: 115854330
Change-Id: I44edb7863daa12352935ffdbed701d4772e93132
2018-09-19 02:30:28 +00:00
Treehugger Robot
b545c70d1d Merge "Simplify logic for getConnectionStatus in HidDeviceProfile" 2018-09-19 02:08:33 +00:00
Treehugger Robot
0ac2a840a0 Merge "Simplify logic for connect in MapClientProfile" 2018-09-19 02:08:05 +00:00
TreeHugger Robot
d6b4dfb761 Merge "Move files to libmedia2_jni_core" 2018-09-19 02:05:27 +00:00
Nan Zhang
1774082767 Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master am: f46a3a3acc
am: 4127448aa7

Change-Id: I1a308ab34a49a94241bc3989f8109526a184a18f
2018-09-18 18:18:40 -07:00
Android Build Merger (Role)
fbb57e6db2 Merge changes from topic "am-19343408044c4969a6a5d04724c92f81"
* changes:
  Merge changes from topic "ota_dexopt_no_ampersand" am: 48b50991ec am: 083bb197bb am: 5a986342cd
  OTA Dexopt: Remove old '&' path am: c260c96b5c am: 188615ead6 am: b030bf0f94
2018-09-19 01:06:00 +00:00
Andreas Gampe
b86e60885b Merge changes from topic "ota_dexopt_no_ampersand" am: 48b50991ec am: 083bb197bb
am: 5a986342cd

Change-Id: I6f7a2d12e107c39950974d48cdf8a165d0e8a2f5
2018-09-18 18:05:06 -07:00
Felipe Leme
afcabc35f4 Merge "Minor improvement on new Q API javadocs." 2018-09-19 01:00:53 +00:00
Nan Zhang
4127448aa7 Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master
am: f46a3a3acc

Change-Id: Ic144a897c4d6b96945cd8a4e878f5b2fed2afa4f
2018-09-18 18:00:46 -07:00
Andreas Gampe
56858ffb1e OTA Dexopt: Remove old '&' path am: c260c96b5c am: 188615ead6
am: b030bf0f94

Change-Id: I01dbe9f3500222bb155de0fbb97413faf75e2092
2018-09-18 17:58:29 -07:00
TreeHugger Robot
027a559172 Merge "Handling potential SIGPIPE signals." 2018-09-19 00:48:42 +00:00
Andreas Gampe
5a986342cd Merge changes from topic "ota_dexopt_no_ampersand" am: 48b50991ec
am: 083bb197bb

Change-Id: I6584054bc2de2b9bd37532c0f0577c63ed59e83c
2018-09-18 17:45:35 -07:00
TreeHugger Robot
f46a3a3acc Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master 2018-09-19 00:44:11 +00:00
Andreas Gampe
b030bf0f94 OTA Dexopt: Remove old '&' path am: c260c96b5c
am: 188615ead6

Change-Id: Ic1fc2bc455d2f4fdb82562b9f1c5771271afac76
2018-09-18 17:39:59 -07:00
TreeHugger Robot
bc0e47c0c5 Merge "Unregister wallpaper visibility listener when nav bar view is destroyed" 2018-09-19 00:35:23 +00:00
Robert Shih
8761bee9ab Move files to libmedia2_jni_core
Bug: 109928575
Test: compiles
Change-Id: I7036261ef53d16392f5dc778335c0413ccaf75ae
2018-09-18 17:34:41 -07:00
Andreas Gampe
083bb197bb Merge changes from topic "ota_dexopt_no_ampersand"
am: 48b50991ec

Change-Id: I7fb29d916a753682807844473e98f48f7ab6eea0
2018-09-18 17:31:14 -07:00
Andreas Gampe
188615ead6 OTA Dexopt: Remove old '&' path
am: c260c96b5c

Change-Id: Ibec9f9b3b929101cc7642f34b8e1213c01f962b9
2018-09-18 17:24:30 -07:00
Ryan Mitchell
500d3f1aee Merge "AAPT2: Added badging and permission" 2018-09-19 00:10:11 +00:00
TreeHugger Robot
3427156b2c Merge "More robust read mechanism in KernelCpuProcReader" 2018-09-18 23:54:14 +00:00
TreeHugger Robot
a52c7fc776 Merge "Log when autofill is disabled in a view." 2018-09-18 23:51:49 +00:00
TreeHugger Robot
500420ce55 Merge "Fixes tapping home button on right edge with quickstep layout" 2018-09-18 23:49:32 +00:00
TreeHugger Robot
a500ceab71 Merge "Implement WebView support for Vulkan using temporary buffer" 2018-09-18 23:46:33 +00:00
TreeHugger Robot
a01a180991 Merge "Added setprop to go back after gesture end" 2018-09-18 23:19:12 +00:00
TreeHugger Robot
e1c0511176 Merge "Remove manager dependency from biometric services" 2018-09-18 23:15:00 +00:00
Treehugger Robot
48b50991ec Merge changes from topic "ota_dexopt_no_ampersand"
* changes:
  OTA Dexopt: Use protocol version 10
  OTA Dexopt: Remove old '&' path
2018-09-18 23:03:47 +00:00
TreeHugger Robot
0a5d59ffd1 Merge "passpoint-r2: add the status for starting second soap exchange" 2018-09-18 22:49:36 +00:00
TreeHugger Robot
4648bd2527 Merge "Fix broken NSSL tests" 2018-09-18 22:44:27 +00:00
TreeHugger Robot
d71c238a67 Merge "Reload theme before dispatching UiMode event" 2018-09-18 22:37:18 +00:00
Android Build Merger (Role)
9119aed58d Merge "Merge "Allow config of wfcSpnFormats to use root locale" am: b9c0115518 am: af72e460a5 am: 805f4e7799" 2018-09-18 22:30:30 +00:00
Youming Ye
9fb304b9b9 Merge "Allow config of wfcSpnFormats to use root locale" am: b9c0115518 am: af72e460a5
am: 805f4e7799

Change-Id: I08eb378443b8f0fb41fc8a4f9439dd2827d6a20e
2018-09-18 15:29:50 -07:00
Winson Chung
b03d44d9d3 Unregister wallpaper visibility listener when nav bar view is destroyed
- The wallpaper visibility listener is only registered but never
  unregistered, and the RemoteCallbackList isn't enough to manage this
  since all instances belong to the same instance of the SysUI process.

Fixes: 79181718
Test: Change configuration to recreate the nav bar and ensure the old
      nav bar transition wallpaper visibility listener is unregistered
      first

Change-Id: I08e1600a016f1ddff51fc2f67eb4ddced42963b6
2018-09-18 15:29:36 -07:00
TreeHugger Robot
173222142f Merge "Always use Context.getSystemService() to get IMM" 2018-09-18 22:25:52 +00:00