OSDN Git Service
Seigo Nonaka [Fri, 23 Jun 2017 12:56:03 +0000 (12:56 +0000)]
Merge "Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 am:
ba12631bba -s ours" into oc-dr1-dev-plus-aosp
am:
4853a717c0 -s ours
Change-Id: I2ddd858d8ad5a5e1277cb266ae373a56cfe08c9e
Neil Fuller [Fri, 23 Jun 2017 12:52:52 +0000 (12:52 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev am:
1ef5cb531d -s ours
am:
ae2e2e0a80 -s ours
Change-Id: Ibbd0c91133b540720e3d4b503ab51523a40ec2d0
Seigo Nonaka [Fri, 23 Jun 2017 12:50:33 +0000 (12:50 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 -s ours am:
2629b0c1a0 -s ours
am:
34f12cca78 -s ours
Change-Id: I101c072d246fa0fce9c0368551f2463d4d548505
TreeHugger Robot [Fri, 23 Jun 2017 12:47:17 +0000 (12:47 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Fri, 23 Jun 2017 12:41:42 +0000 (12:41 +0000)]
Merge "Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 am:
ba12631bba -s ours" into oc-dr1-dev-plus-aosp
Seigo Nonaka [Fri, 23 Jun 2017 12:41:01 +0000 (12:41 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1
am:
ba12631bba -s ours
Change-Id: If5124a045069500c2cf3c52da2533603de5e4816
Seigo Nonaka [Fri, 23 Jun 2017 12:40:09 +0000 (12:40 +0000)]
Stop loading other package's font by default.
am:
c25c3da8b6 -s ours
Change-Id: I603db265b2312ad7177fd7724793fe94db78e3f8
Neil Fuller [Fri, 23 Jun 2017 12:38:04 +0000 (12:38 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev
am:
1ef5cb531d -s ours
Change-Id: I1e4aa0af645bd9dc34e0ebd0ad9ab091d2049aee
Seigo Nonaka [Fri, 23 Jun 2017 12:35:19 +0000 (12:35 +0000)]
Merge "Stop loading other package's font by default." into oc-dev am:
824d75e0e1 -s ours
am:
2629b0c1a0 -s ours
Change-Id: Ie753fcbec56aab3a6718140a71a0d7e44e4a23dd
TreeHugger Robot [Fri, 23 Jun 2017 12:31:40 +0000 (12:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Neil Fuller [Fri, 23 Jun 2017 12:28:31 +0000 (12:28 +0000)]
Merge "Stop loading other package's font by default." into oc-dr1-dev
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit
6d6cd68660635d670b0cb17f348b7c1da13704b3)
Seigo Nonaka [Fri, 23 Jun 2017 12:23:36 +0000 (12:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1 -s ours
Change-Id: Ib6375fdfa9295add1e4d53f220f3b8d22f48b855
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
(cherry picked from commit
6d6cd68660635d670b0cb17f348b7c1da13704b3)
Daniel Nishi [Fri, 23 Jun 2017 04:40:53 +0000 (04:40 +0000)]
Merge "Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf am:
41b743d8ad" into oc-dr1-dev-plus-aosp
am:
17c78a1e6b
Change-Id: If88fde815c8e25c6316ca01c162311555a99c322
Daniel Nishi [Fri, 23 Jun 2017 04:37:15 +0000 (04:37 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf am:
58ad534db8
am:
c91e446b63
Change-Id: I8f746a8541d1c6c0eaa8b798e7c201eedfeb9389
Android Build Merger (Role) [Fri, 23 Jun 2017 04:31:45 +0000 (04:31 +0000)]
Merge "Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf am:
41b743d8ad" into oc-dr1-dev-plus-aosp
Daniel Nishi [Fri, 23 Jun 2017 04:28:41 +0000 (04:28 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf
am:
58ad534db8
Change-Id: Ibef96b005e6227cd20c834b238f3561f2d7e218f
Daniel Nishi [Fri, 23 Jun 2017 04:28:37 +0000 (04:28 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev am:
f14c1e12cf
am:
41b743d8ad
Change-Id: Ie55bd4b478a3ca4ea475132ade37f03a0b9b4a00
Seigo Nonaka [Fri, 23 Jun 2017 04:23:44 +0000 (04:23 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
am:
824d75e0e1
Change-Id: I5518dbd8b5d8a4548ea00bbfca0e3aee87880ee7
Daniel Nishi [Fri, 23 Jun 2017 04:19:13 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: Ied7c80b4b9e58fa0d5b31e7a7bce33028e55337b
Daniel Nishi [Fri, 23 Jun 2017 04:19:10 +0000 (04:19 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
am:
f14c1e12cf
Change-Id: I48c0c952d4679304d1adcda238e93c6bdd133110
Bill Yi [Fri, 23 Jun 2017 04:17:01 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76bb8e2fed568a66c30becf53b570a0862b04896
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 23 Jun 2017 04:10:42 +0000 (04:10 +0000)]
Merge "Stop loading other package's font by default." into oc-dev
TreeHugger Robot [Fri, 23 Jun 2017 04:09:32 +0000 (04:09 +0000)]
Merge "Add in the getCacheQuotaBytes method to wrapper." into oc-dev
Marie Janssen [Fri, 23 Jun 2017 03:56:36 +0000 (03:56 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse" am:
5a56873612 am:
3205ff1331 am:
f71b0bedcf
am:
0444f135c6
Change-Id: I3ab05ce665eee7d2b417f87b38d5cd76bebc535c
Bill Yi [Fri, 23 Jun 2017 03:54:59 +0000 (20:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58a5fcd4e2226f31bc23394de51301b3ae53aa66
Auto-generated-cl: translation import
Marie Janssen [Fri, 23 Jun 2017 03:47:09 +0000 (03:47 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse" am:
5a56873612 am:
3205ff1331
am:
f71b0bedcf
Change-Id: I615f8f2d16d2dd17fcbd5df20378766096631eeb
TreeHugger Robot [Fri, 23 Jun 2017 03:43:48 +0000 (03:43 +0000)]
Merge "Media: Eliminate NPE from race conditions"
Marie Janssen [Fri, 23 Jun 2017 03:38:17 +0000 (03:38 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse" am:
5a56873612
am:
3205ff1331
Change-Id: I0cd44ad8d22da154d0bf666b9075a3fcbc655439
Marie Janssen [Fri, 23 Jun 2017 03:28:34 +0000 (03:28 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
am:
5a56873612
Change-Id: Ie202361631f9268055a190c8606e07d89dc349d4
Marie Janssen [Fri, 23 Jun 2017 03:17:35 +0000 (03:17 +0000)]
Merge "Bluetooth: minor documentation fix to de-confuse"
Wale Ogunwale [Fri, 23 Jun 2017 02:39:20 +0000 (02:39 +0000)]
Merge "Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898 am:
13df994243" into oc-dr1-dev-plus-aosp
am:
99a313e323
Change-Id: I692dce1776052c07140c114d17ecd907b0d5ac6a
Wale Ogunwale [Fri, 23 Jun 2017 02:36:01 +0000 (02:36 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898 am:
e30da86a46
am:
9842dec610
Change-Id: I76813be6d41381ef616270a71df34ea2507639c6
Android Build Merger (Role) [Fri, 23 Jun 2017 02:29:25 +0000 (02:29 +0000)]
Merge "Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898 am:
13df994243" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Fri, 23 Jun 2017 02:27:28 +0000 (02:27 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898
am:
e30da86a46
Change-Id: Idad772522638c93a1d2a042aa374ec2cabf55167
Wale Ogunwale [Fri, 23 Jun 2017 02:27:23 +0000 (02:27 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev am:
b55b842898
am:
13df994243
Change-Id: Ia38529b06e7859884531f945fa32770017f11467
Wale Ogunwale [Fri, 23 Jun 2017 02:19:26 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514
Wale Ogunwale [Fri, 23 Jun 2017 02:19:25 +0000 (02:19 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
am:
b55b842898
Change-Id: I36a34d029f75195d4a865affef5257f1d4aa5d50
Badhri Jagan Sridharan [Fri, 23 Jun 2017 02:15:26 +0000 (02:15 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev am:
025b07c38e
am:
4fd5aff33b
Change-Id: Idad8e4bc9afae725f52ca17f933a0fca28acfd0d
TreeHugger Robot [Fri, 23 Jun 2017 02:10:32 +0000 (02:10 +0000)]
Merge "Dump user id in dumpsys activity starter" into oc-dev
Badhri Jagan Sridharan [Fri, 23 Jun 2017 02:07:57 +0000 (02:07 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
am:
025b07c38e
Change-Id: Icd1d42fd0fb301f68dae38a242760035c1f6dfec
Seigo Nonaka [Thu, 22 Jun 2017 15:22:18 +0000 (08:22 -0700)]
Stop loading other package's font by default.
Since CONTEXT_RESTRICTED is not a default flag of createPackageContext,
we can't rely on it for preventing unexpected font injections.
To protect developers and existing apps from a risk of font injection,
stop loading font from other package's resouce unless the developer
explicitly set CONTEXT_IGNORE_SECURITY.
This CL contains Iac2a6fb3d82ef23d5ca6ee33f4aaa9ed28455271 by manual
merging to handle repository split.
Bug:
62813533
Bug:
62879353
Test: Manually done
Merged-In: I4442ddc48dadb5c968b444be86038b602074d301
Change-Id: I4442ddc48dadb5c968b444be86038b602074d301
TreeHugger Robot [Fri, 23 Jun 2017 01:58:19 +0000 (01:58 +0000)]
Merge "Log call to setPortRoles" into oc-dr1-dev
Daniel Nishi [Fri, 23 Jun 2017 01:53:03 +0000 (18:53 -0700)]
Add in the getCacheQuotaBytes method to wrapper.
Bug:
62623731
Test: Settings Unit Test
Change-Id: Ibd779c7d9e60c44440483489b231ba0715321bc1
Felipe Leme [Fri, 23 Jun 2017 00:57:32 +0000 (00:57 +0000)]
Merge "Improved documentation for AutofillService package: am:
2ef19c1d73 am:
91d763f1b5" into oc-dr1-dev-plus-aosp
am:
9ee91bfd67
Change-Id: I2137ed8f6bc60010666b2115e4f5a57cc8199ccd
Felipe Leme [Fri, 23 Jun 2017 00:53:20 +0000 (00:53 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73 am:
472b4c834f
am:
9485ed3142
Change-Id: I8c0c4f2aa8f2c70cb1611c2afc1f93cc1e81dbc5
Android Build Merger (Role) [Fri, 23 Jun 2017 00:48:12 +0000 (00:48 +0000)]
Merge "Improved documentation for AutofillService package: am:
2ef19c1d73 am:
91d763f1b5" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 23 Jun 2017 00:44:53 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
91d763f1b5
Change-Id: Iecf6e6d7f5461f944b1f3e23e9f97ccca5029983
Felipe Leme [Fri, 23 Jun 2017 00:44:47 +0000 (00:44 +0000)]
Improved documentation for AutofillService package: am:
2ef19c1d73
am:
472b4c834f
Change-Id: I9636c277b82569e6ffa684df26358a6a7c36d3c2
Felipe Leme [Fri, 23 Jun 2017 00:36:37 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: Iac283d34da149829a25313d0910f2564b347e332
Felipe Leme [Fri, 23 Jun 2017 00:36:35 +0000 (00:36 +0000)]
Improved documentation for AutofillService package:
am:
2ef19c1d73
Change-Id: I67d6649d4acb84ebb598c1ebceb3c3ed58cfd0c0
Charlie Wang [Fri, 23 Jun 2017 00:00:14 +0000 (00:00 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev am:
d43bc31eb7
am:
2e711b27f3
Change-Id: If5928a835b7849fdee2f9ca6c99fe1b98f5eaa59
Charlie Wang [Thu, 22 Jun 2017 23:47:55 +0000 (23:47 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
am:
d43bc31eb7
Change-Id: I4a82f38e753d7ba61ec37b7ecd959e588eee21e3
Ying Xu [Thu, 22 Jun 2017 23:44:11 +0000 (23:44 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev am:
9523a12b95 -s ours
am:
296b9d822a -s ours
Change-Id: I630886defc408edccc813ebc5a289f2df1185ab5
Wale Ogunwale [Thu, 22 Jun 2017 23:43:53 +0000 (16:43 -0700)]
Dump user id in dumpsys activity starter
To help with ANR debugging.
Test: adb shell dumpsys activity starter
Bug:
38121026
Change-Id: I96d530662e6a362b817df3ca8410cb173a2c0dd4
Badhri Jagan Sridharan [Thu, 22 Jun 2017 23:39:47 +0000 (16:39 -0700)]
Log call to setPortRoles
Came of bunch of bugs, for instance b/
62912250 where some app is
forcing the port role. Logging which package is doing this
Change-Id: I234db3292326d247c82723989b46160fcbd59c10
Charlie Wang [Thu, 22 Jun 2017 23:35:20 +0000 (23:35 +0000)]
Merge "Adding tron logging events for standalone headsets." into oc-dr1-dev
Ying Xu [Thu, 22 Jun 2017 23:29:50 +0000 (23:29 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
am:
9523a12b95 -s ours
Change-Id: I4b2f10eab109ef9e912fd0a6674fa3e7341b1e8d
Siddharth Ray [Thu, 22 Jun 2017 23:23:59 +0000 (23:23 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev am:
424e517d5d
am:
ea0e205a89
Change-Id: I703fa0dbe43212422c577c4fa2083175d6fbb0aa
Ying Xu [Thu, 22 Jun 2017 23:19:57 +0000 (23:19 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." into oc-dr1-dev
Stephen Chen [Thu, 22 Jun 2017 23:12:20 +0000 (23:12 +0000)]
Add strings for revamped Wi-Fi ONA notification. am:
2e8351b308
am:
20efc35c3a
Change-Id: I3b5a2cf4f81f2624ccb1455968de42fd862b827b
Tomasz Wasilczyk [Thu, 22 Jun 2017 23:07:39 +0000 (23:07 +0000)]
Merge "Rename Broadcast Radio service to avoid confusion with GSM radio."
Siddharth Ray [Thu, 22 Jun 2017 23:05:24 +0000 (23:05 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
am:
424e517d5d
Change-Id: I4d7c458c02e3de1d707c6314102bb8b00fe2bda6
Alan Leung [Thu, 22 Jun 2017 23:04:04 +0000 (23:04 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp am:
643275b838
am:
94e68505c4 -s ours
Change-Id: I90f52e9ca4a2db85ae4baad413b7cd768ab05771
TreeHugger Robot [Thu, 22 Jun 2017 23:01:29 +0000 (23:01 +0000)]
Merge "Don't statically link libcrypto in frameworks."
TreeHugger Robot [Thu, 22 Jun 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Emergency SUPL when location is disabled" into oc-dr1-dev
Android Build Merger (Role) [Thu, 22 Jun 2017 22:59:05 +0000 (22:59 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
921fc1426f am:
c2cf09b7ea"
TreeHugger Robot [Thu, 22 Jun 2017 22:58:49 +0000 (22:58 +0000)]
Merge "Use RemoteCallbackList to implement TSMS#mListeners"
Todd Kennedy [Thu, 22 Jun 2017 22:58:09 +0000 (22:58 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
921fc1426f
am:
c2cf09b7ea
Change-Id: Ia05c496ee04c3f47757b0e6126549d01f40eb066
Stephen Chen [Thu, 22 Jun 2017 22:56:27 +0000 (22:56 +0000)]
Add strings for revamped Wi-Fi ONA notification.
am:
2e8351b308
Change-Id: I0ceb50c182c3ea023167915d28cf04d79f75d8eb
Alan Leung [Thu, 22 Jun 2017 22:50:42 +0000 (22:50 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
am:
643275b838
Change-Id: Idb669d7b381f8291fb44dcc5a4d1824d118319d9
Todd Kennedy [Thu, 22 Jun 2017 22:48:44 +0000 (22:48 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
20fad610b9" into oc-dr1-dev-plus-aosp
am:
bc5b5567d0
Change-Id: I9be704b2ad3f97df5ce7327675b459ffc84abafd
Todd Kennedy [Thu, 22 Jun 2017 22:47:18 +0000 (22:47 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
921fc1426f
Change-Id: I322d7d8b576e00ad10d85d462873c10cce712951
Rob Carr [Thu, 22 Jun 2017 22:45:47 +0000 (22:45 +0000)]
Merge "Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
9e391f9f86" into oc-dr1-dev-plus-aosp
am:
532ed66cc6
Change-Id: Ib33693399ba243a39fa4a7b3811d5c35b9c92a11
Rob Carr [Thu, 22 Jun 2017 22:41:39 +0000 (22:41 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
874b6402af
am:
9a8971fabb
Change-Id: Ida4fd8f112a7164fb79512d09eadd10da718c269
Stephen Chen [Wed, 7 Jun 2017 22:49:13 +0000 (15:49 -0700)]
Add strings for revamped Wi-Fi ONA notification.
Bug:
37357441
Test: n/a
Change-Id: Ib32581f044db9827a700be8af1864af15f6dbb3e
Jean-Michel Trivi [Thu, 22 Jun 2017 22:39:48 +0000 (22:39 +0000)]
Merge "Recording activity notification: client uid and package name"
Android Build Merger (Role) [Thu, 22 Jun 2017 22:37:54 +0000 (22:37 +0000)]
Merge "Merge "ASM Priority Boost Tool" am:
8ff8dd16cc am:
8ac18ceb8a" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 22:36:49 +0000 (22:36 +0000)]
Merge "Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e am:
20fad610b9" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:52 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev am:
16503a8f7e
am:
20fad610b9
Change-Id: I6d6fd8f320fef01c2a89463ce0f72f0f880e1e45
Android Build Merger (Role) [Thu, 22 Jun 2017 22:34:52 +0000 (22:34 +0000)]
Merge "Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c am:
9e391f9f86" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 22 Jun 2017 22:35:06 +0000 (22:35 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: I13cf0e00de235d0bbdb79aa553e04386c519975d
Alan Leung [Thu, 22 Jun 2017 22:34:29 +0000 (22:34 +0000)]
Merge "ASM Priority Boost Tool" am:
8ff8dd16cc
am:
8ac18ceb8a
Change-Id: I68f86f307368de6870a7d649118d1a0f8c744a88
Rob Carr [Thu, 22 Jun 2017 22:33:51 +0000 (22:33 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
9e391f9f86
Change-Id: I8566d935ec735b360af54998599a8ce185fcf9ee
Rob Carr [Thu, 22 Jun 2017 22:32:07 +0000 (22:32 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev am:
82b41e460c
am:
874b6402af
Change-Id: I3db14694bc27e9fed16b5efec6aba99570b89675
TreeHugger Robot [Thu, 22 Jun 2017 22:28:02 +0000 (22:28 +0000)]
Merge "Stop loading other package's font by default."
Todd Kennedy [Thu, 22 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
am:
16503a8f7e
Change-Id: Ia20de35097f3b5b139afc5ccee59d71584f59a3a
Felipe Leme [Mon, 5 Jun 2017 18:32:32 +0000 (11:32 -0700)]
Improved documentation for AutofillService package:
- Moved (and expanded) overall documentation from FillResponse to
AutofillService.
- Improved SaveInfo documentation.
- Improved FillRequest documentation.
- Improved Dataset documentation.
Bug:
37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I157893deac06a5ed5e1cb7fd082da485f227b9ee
Alan Leung [Thu, 22 Jun 2017 22:24:51 +0000 (22:24 +0000)]
Merge "ASM Priority Boost Tool"
am:
8ff8dd16cc
Change-Id: Ifb62ee3132e984340e4457b543c4f84f7c45995a
Rob Carr [Thu, 22 Jun 2017 22:23:19 +0000 (22:23 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I47c8e096ccd513eb65fa9fd2a34fc75fa222a42c
Rajeev Kumar [Thu, 22 Jun 2017 22:22:47 +0000 (22:22 +0000)]
Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in SwipeHelper class 2. Make few instance variables final"
Rob Carr [Thu, 22 Jun 2017 22:19:45 +0000 (22:19 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
am:
82b41e460c
Change-Id: I14f6fe76b3a24266432a8bc7286d1ae5da8f719d
Neil Fuller [Thu, 22 Jun 2017 22:14:18 +0000 (22:14 +0000)]
Merge "Fix code and test related to rules version check" am:
a3579d4b84 am:
c506ade205 am:
af32c3d234
am:
9b28a61fcf
Change-Id: Ia0e1e74364b9a72d9ec4e7058313c2c26f71d206
TreeHugger Robot [Thu, 22 Jun 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Allow any app to dynamically install a split" into oc-dev
Treehugger Robot [Thu, 22 Jun 2017 22:10:56 +0000 (22:10 +0000)]
Merge "ASM Priority Boost Tool"
Shubang [Thu, 22 Jun 2017 22:09:38 +0000 (22:09 +0000)]
Merge "Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1 am:
e9ede0548b" into oc-dr1-dev-plus-aosp
am:
f541405afe
Change-Id: Ic868b80e07c0585132f14f7c9dc2b490c811a9f6
Rob Carr [Thu, 22 Jun 2017 22:08:03 +0000 (22:08 +0000)]
Merge "ListPopupWindow: Wrap new bounds checking in targetSdk check." into oc-dev
Shubang [Thu, 22 Jun 2017 22:05:49 +0000 (22:05 +0000)]
Merge "Change PIP notification icon" into oc-dev am:
9f3967fee1 am:
745bbf758d
am:
faf8b8a9ee
Change-Id: I71bcda9ff79c411eb1310e3c958b05272a3ef67b
Android Build Merger (Role) [Thu, 22 Jun 2017 22:02:10 +0000 (22:02 +0000)]
Merge "Merge "Add tintable icon support" into oc-dr1-dev am:
53d79aa8ea am:
2e7d53964d"
OSDN Git Service
