OSDN Git Service
Android Build Merger (Role) [Fri, 11 Aug 2017 23:31:52 +0000 (23:31 +0000)]
Merge "Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev am:
3df6be7875 am:
de90ca8412"
Roozbeh Pournader [Fri, 11 Aug 2017 23:27:50 +0000 (23:27 +0000)]
Merge "Support multiple languages per font in fonts.xml"
Peter Qiu [Fri, 11 Aug 2017 23:27:24 +0000 (23:27 +0000)]
Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev am:
3df6be7875
am:
de90ca8412
Change-Id: Idace7218dc222d6edcebf77861f941a3684a3211
Calin Juravle [Fri, 11 Aug 2017 23:24:15 +0000 (23:24 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev am:
5ba8e3dc78
am:
f4f8058c51
Change-Id: I61c9c853b2e3173bff00daa8b2c8d89ddea0bd44
Pankaj Kanwar [Fri, 11 Aug 2017 23:20:50 +0000 (23:20 +0000)]
Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b" into oc-mr1-dev am:
149cfd37db
am:
fded73b8a2
Change-Id: If8fd7b6a9387256b6ae0183ba2c74f366aed3a18
Michal Karpinski [Fri, 11 Aug 2017 22:53:04 +0000 (22:53 +0000)]
Merge "Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev am:
5500732584" into oc-mr1-dev-plus-aosp
am:
3e7f323481
Change-Id: I6ab2c9d851ebfe46b7e62753f047ef2976524f6a
Cindy Kuang [Fri, 11 Aug 2017 22:38:54 +0000 (22:38 +0000)]
Merge "Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp am:
3ae1e07073" into oc-mr1-dev-plus-aosp
am:
b1ac97e5c1
Change-Id: Idefa605a67d40a4ec2d5f8c242e79acf653cb701
Peter Qiu [Fri, 11 Aug 2017 22:35:10 +0000 (22:35 +0000)]
Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
am:
3df6be7875
Change-Id: Idc8943172f4540b1c7da47c6da24d5d1eed843a4
Winson Chung [Fri, 11 Aug 2017 22:34:34 +0000 (22:34 +0000)]
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev am:
35ebb3c535
am:
e1cd325bca
Change-Id: I41d36d3861edb28476ec7123d1ccb3adce3c49e7
Steven Moreland [Fri, 11 Aug 2017 22:28:23 +0000 (22:28 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7 am:
99cb134bf2 -s ours am:
7c9f93d832 -s ours
am:
d5593e0f19 -s ours
Change-Id: Ieb4c1ef120eca3bab9c561adb1295c8dd9ed39de
Calin Juravle [Fri, 11 Aug 2017 22:23:34 +0000 (22:23 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev
am:
5ba8e3dc78
Change-Id: I1236a8f4bc1a11abde32e9462aefcba6d88e1854
Pankaj Kanwar [Fri, 11 Aug 2017 22:18:49 +0000 (22:18 +0000)]
Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b" into oc-mr1-dev
am:
149cfd37db
Change-Id: I99094f0da0fcb3c995ad777a31a60e4ac826e04e
Android Build Merger (Role) [Fri, 11 Aug 2017 22:13:38 +0000 (22:13 +0000)]
Merge "Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev am:
5500732584" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 11 Aug 2017 22:10:37 +0000 (22:10 +0000)]
Merge "Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp am:
3ae1e07073" into oc-mr1-dev-plus-aosp
Michal Karpinski [Fri, 11 Aug 2017 22:09:28 +0000 (22:09 +0000)]
Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev
am:
5500732584
Change-Id: Ibbe75bff86138dfd0d2b623dffd08610c5b3823e
Cindy Kuang [Fri, 11 Aug 2017 22:02:22 +0000 (22:02 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp
am:
3ae1e07073
Change-Id: Idce519ed971742f869003fd70684615829cbe19b
Winson Chung [Fri, 11 Aug 2017 22:00:51 +0000 (22:00 +0000)]
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev
am:
35ebb3c535
Change-Id: I6c37b1732ac7941f5504b1c5d9ac8e13d8715606
Cindy Kuang [Fri, 11 Aug 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp am:
1c634381b1
am:
d7522c5c8c
Change-Id: I8e0c0e818a260b64fe95492d4244a77fd675cb79
Steven Moreland [Fri, 11 Aug 2017 21:48:37 +0000 (21:48 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7 am:
99cb134bf2 -s ours
am:
7c9f93d832 -s ours
Change-Id: I3b96834e93a0787075902b6464c0b6cbef9d102e
Cindy Kuang [Fri, 11 Aug 2017 21:48:21 +0000 (21:48 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
e4f02db258 am:
51bc4b6c32
am:
c5f6633fdc
Change-Id: I2dc793d60ec75c340b9ae64a0464303e92b41c62
Android Build Merger (Role) [Fri, 11 Aug 2017 21:43:59 +0000 (21:43 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp
Cindy Kuang [Fri, 11 Aug 2017 21:43:11 +0000 (21:43 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp am:
a54ab7edf4
am:
3e85fa11ea
Change-Id: I3219a23702cb0d597093f03d2bebcf21722ca695
Cindy Kuang [Fri, 11 Aug 2017 21:38:58 +0000 (21:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
f125024688
Change-Id: I3722fb9dc286ca00da780ba15346ea0a88ea6d3e
Cindy Kuang [Fri, 11 Aug 2017 21:38:13 +0000 (21:38 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp
am:
1c634381b1
Change-Id: Ib24f1f55eadcb9076fd81014c2afcab7e173ca4e
Cindy Kuang [Fri, 11 Aug 2017 21:33:43 +0000 (21:33 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
e4f02db258
am:
51bc4b6c32
Change-Id: I2f04732899a58b64ffb820d62a53a70c1b723f8c
Steven Moreland [Fri, 11 Aug 2017 21:33:42 +0000 (21:33 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7
am:
99cb134bf2 -s ours
Change-Id: I17668ddde69926f6648d75f2b74f54f234fc5c02
Pankaj Kanwar [Fri, 11 Aug 2017 21:33:23 +0000 (21:33 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b am:
b30749b60f
am:
1b7a9c9a49
Change-Id: I60e31f7734b28954ab110292466826b376184798
TreeHugger Robot [Fri, 11 Aug 2017 21:28:00 +0000 (21:28 +0000)]
Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 21:26:53 +0000 (21:26 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:24:02 +0000 (21:24 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594
am:
e04a0bf5c7
Change-Id: I3e4e01a5e328ede527ee49d36ac828205994639d
Cindy Kuang [Fri, 11 Aug 2017 21:22:42 +0000 (21:22 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65
am:
07f5257b19
Change-Id: I74c7e7906b4cdcaefc65787ce4d9fcf35a2cecb3
Calin Juravle [Fri, 11 Aug 2017 21:22:03 +0000 (21:22 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:20:11 +0000 (21:20 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
e4f02db258
Change-Id: I14c80bbd8838b6af2010463e9d1fb25cf537a167
Cindy Kuang [Fri, 11 Aug 2017 21:16:29 +0000 (21:16 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp
am:
a54ab7edf4
Change-Id: I0350cf5af828990539d0fa9ec925feef54348a49
Cindy Kuang [Fri, 11 Aug 2017 21:14:33 +0000 (21:14 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: I297557eb072b1fce0395c93c2a770623b5ba1642
Android Build Merger (Role) [Fri, 11 Aug 2017 21:13:27 +0000 (21:13 +0000)]
Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b" into oc-mr1-dev
Pankaj Kanwar [Fri, 11 Aug 2017 21:11:25 +0000 (21:11 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b
am:
b30749b60f
Change-Id: Ie6d0c953dcab31ef98dc68bed1e88e496331f333
Michal Karpinski [Fri, 11 Aug 2017 21:09:52 +0000 (21:09 +0000)]
Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 21:08:13 +0000 (21:08 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:07:06 +0000 (21:07 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
am:
75c9e4d594
Change-Id: I170b5846981683eacee1081587c7149bab454d91
Pankaj Kanwar [Fri, 11 Aug 2017 21:07:06 +0000 (21:07 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
am:
bcfa22584b
Change-Id: I36289ff0e5d2949d93ecbc0c18e131772706c9cc
Cindy Kuang [Fri, 11 Aug 2017 21:06:56 +0000 (21:06 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: Ida5507009926a936ee247c2f43f44b439351d937
Todd Kennedy [Fri, 11 Aug 2017 21:02:30 +0000 (21:02 +0000)]
Merge "Save observer in call to commit" into oc-mr1-dev am:
20c2641ad4
am:
f567dd46da
Change-Id: Ic3c9beaff7aca8e9a46595b1511ef7023fe980ac
Cindy Kuang [Fri, 11 Aug 2017 21:01:15 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I094bd99bcaaf51633ac887d38a9323ed5fdc54e2
Pankaj Kanwar [Fri, 11 Aug 2017 21:01:13 +0000 (21:01 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
am:
bcfa22584b
Change-Id: I4cdef151e4a826cee965954352f101c3bdd86d09
Cindy Kuang [Fri, 11 Aug 2017 21:01:11 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65
am:
1e6401b07e
Change-Id: I48f9a5fc207a2c884e51c9091bd19db9bdf15471
Pankaj Kanwar [Fri, 11 Aug 2017 20:52:52 +0000 (20:52 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
Neil Fuller [Fri, 11 Aug 2017 20:50:32 +0000 (20:50 +0000)]
Merge "Change SystemApi as per API council feedback"
Todd Kennedy [Fri, 11 Aug 2017 20:49:00 +0000 (20:49 +0000)]
Merge "Save observer in call to commit" into oc-mr1-dev
am:
20c2641ad4
Change-Id: Ie4917755c4936d8afc876aeb60fda4ee225fadb4
Cindy Kuang [Fri, 11 Aug 2017 20:45:24 +0000 (20:45 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I7138667ba48fa590c4a7f30cdecf0381c43050a6
Treehugger Robot [Fri, 11 Aug 2017 20:40:35 +0000 (20:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
Beverly [Fri, 11 Aug 2017 20:39:36 +0000 (20:39 +0000)]
Merge "Merge "Each package can enqueue one toast at a time." into oc-mr1-dev am:
a606d1049f" into oc-mr1-dev-plus-aosp
am:
4bb0eb9fb2
Change-Id: I9196d40986ae51f5e308a48940a7c6f8d88609c0
Cindy Kuang [Fri, 11 Aug 2017 20:38:35 +0000 (20:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
TreeHugger Robot [Fri, 11 Aug 2017 20:38:01 +0000 (20:38 +0000)]
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 20:33:34 +0000 (20:33 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
Steven Moreland [Fri, 11 Aug 2017 20:31:08 +0000 (20:31 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am:
3f378940c2 am:
93d8497094 am:
29327cbed9
am:
7de64d2771
Change-Id: Id59a9457ba34bce71a2bba579ac9b7cf452699da
TreeHugger Robot [Fri, 11 Aug 2017 20:29:03 +0000 (20:29 +0000)]
Merge "Save observer in call to commit" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 20:28:43 +0000 (20:28 +0000)]
Merge "Merge "Each package can enqueue one toast at a time." into oc-mr1-dev am:
a606d1049f" into oc-mr1-dev-plus-aosp
Beverly [Fri, 11 Aug 2017 20:23:51 +0000 (20:23 +0000)]
Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
am:
a606d1049f
Change-Id: Ib1685574483b83968b4fc14f788d3496a436c096
Steven Moreland [Fri, 11 Aug 2017 20:20:29 +0000 (20:20 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am:
3f378940c2 am:
93d8497094
am:
29327cbed9
Change-Id: I93c10835f80d9330c2d7dfd02db97df34005e7b6
Steven Moreland [Fri, 11 Aug 2017 20:17:24 +0000 (20:17 +0000)]
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp am:
8b0e069815
am:
92a7a63d93
Change-Id: Ia24c4c3e2c3754509934576e30e500f1f5aa1a12
TreeHugger Robot [Fri, 11 Aug 2017 20:15:58 +0000 (20:15 +0000)]
Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
Steven Moreland [Fri, 11 Aug 2017 20:12:31 +0000 (20:12 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am:
3f378940c2
am:
93d8497094
Change-Id: Ib2a80b747bd1a0c4692a89d17bd96eeb03dbe46e
Steven Moreland [Fri, 11 Aug 2017 20:04:15 +0000 (20:04 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
am:
3f378940c2
Change-Id: Iecb2b1b6ba647b0fe65c538f0a1cdb957e6dbb3e
Steven Moreland [Fri, 11 Aug 2017 20:04:15 +0000 (20:04 +0000)]
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
am:
8b0e069815
Change-Id: Id8c2004d6e1e4db786244afd1de48d14d21bba57
Yin-Chia Yeh [Fri, 11 Aug 2017 20:03:53 +0000 (20:03 +0000)]
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev am:
0cfad57566
am:
df7d855072
Change-Id: I945d6ef3bad30a96c1ff1457b793bf5270e6950e
Beverly [Fri, 11 Aug 2017 19:59:43 +0000 (19:59 +0000)]
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev am:
3e4e9e234a
am:
b463d29a62
Change-Id: I1ceeef9d0dcdd5bd0c5607ecc76e000608c3ca5f
TreeHugger Robot [Fri, 11 Aug 2017 19:55:19 +0000 (19:55 +0000)]
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 11 Aug 2017 19:53:32 +0000 (19:53 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
Julia Reynolds [Fri, 11 Aug 2017 19:49:50 +0000 (19:49 +0000)]
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev am:
24a94491e4
am:
4d47f34633
Change-Id: Ica35f6b3716f76d6e29fbec3e62bc7117ad524ec
Yin-Chia Yeh [Fri, 11 Aug 2017 19:44:50 +0000 (19:44 +0000)]
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
am:
0cfad57566
Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a
Beverly [Fri, 11 Aug 2017 19:40:35 +0000 (19:40 +0000)]
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
am:
3e4e9e234a
Change-Id: Ibce8d8983efc859d4c37168c900303db49f4e69a
Roozbeh Pournader [Wed, 9 Aug 2017 16:42:20 +0000 (09:42 -0700)]
Support multiple languages per font in fonts.xml
Minikin already supports multiple languages specified per font in
I7f13b51464c9b01982bb573251d77052b9ddbd70. This CL adds a couple of
such cases into fonts.xml and clarifies in the method and the
variable names and parameters that the frameworks is handling a
multi-language string when it is.
Fixes:
26687969
Test: make -j checkbuild
Test: bit FrameworksCoreTests:android.graphics.TypefaceSystemFallbackTest
Change-Id: Ifa540a95f87921983f9069330d1dd0892538a8df
Julia Reynolds [Fri, 11 Aug 2017 19:28:29 +0000 (19:28 +0000)]
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
am:
24a94491e4
Change-Id: Iaefcb277dffd79f0851d759df8afbf3bbc1d14b5
Tyler Gunn [Fri, 11 Aug 2017 19:26:19 +0000 (19:26 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed am:
63769af59d am:
347e5ff103 am:
cc1552a2a3
am:
c3860b3b52
Change-Id: I7039033d15a4ca4b1fd76a26ca9a1104697c2e44
TreeHugger Robot [Fri, 11 Aug 2017 19:23:11 +0000 (19:23 +0000)]
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 19:16:17 +0000 (19:16 +0000)]
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
Tyler Gunn [Fri, 11 Aug 2017 19:12:24 +0000 (19:12 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed am:
63769af59d am:
347e5ff103
am:
cc1552a2a3
Change-Id: Iac3cd7f26b7a6e7134b9de6b34cdddb2b3e72d4e
Tyler Gunn [Fri, 11 Aug 2017 19:03:20 +0000 (19:03 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed am:
63769af59d
am:
347e5ff103
Change-Id: I1a53bf75715c4d7d1b2fbd7ebf6dc96c06b78a2f
Julia Reynolds [Fri, 11 Aug 2017 18:48:05 +0000 (18:48 +0000)]
Merge "usb string update" into oc-mr1-dev am:
e25757a106
am:
abca4907d2
Change-Id: If915c7f08a7d383f7afb5430ebdd087cf96b9b0c
Tyler Gunn [Fri, 11 Aug 2017 18:47:18 +0000 (18:47 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed
am:
63769af59d
Change-Id: I798dc5b56fb8f212153d87e71ac088ba177875b8
Calin Juravle [Fri, 11 Aug 2017 00:23:00 +0000 (17:23 -0700)]
Ensure dexopt is executed only with consistent package data
The main objects bookkeeping packages (PackageParser.Package and its
corresponding ApplicationInfo) may be updated at different times. This
creates a window where the data stored in the ApplicationInfo is out of
date with respect to the data stored in PackageParser.Package.
During install, the two objects are "synced" during doRename which updates
the package code paths.
This CLs moves the dexopt invocation from the install flow after doRename
to ensure that dexopt logic gets a consistent view of the package.
Bug:
64493351
Test: run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m
CtsAppSecurityHostTestCases
inspect oat files after
adb install-multiple CtsClassloaderSplitApp/CtsClassloaderSplitApp.apk
CtsClassloaderSplitAppFeatureA/CtsClassloaderSplitAppFeatureA.apk
CtsClassloaderSplitAppFeatureB/CtsClassloaderSplitAppFeatureB.apk
Change-Id: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b
Tyler Gunn [Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)]
Merge changes from topic 'call-session-may'
am:
21e4dbb6ed
Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
Julia Reynolds [Fri, 11 Aug 2017 18:33:32 +0000 (18:33 +0000)]
Merge "usb string update" into oc-mr1-dev
am:
e25757a106
Change-Id: I2c9f9096eeb849191050ed543c7e024ebc088db0
TreeHugger Robot [Fri, 11 Aug 2017 18:18:42 +0000 (18:18 +0000)]
Merge "usb string update" into oc-mr1-dev
Neil Fuller [Fri, 11 Aug 2017 18:18:40 +0000 (18:18 +0000)]
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev am:
252efbcf40
am:
a4d8a47f4c
Change-Id: I82ab3968e96bf1b37bd16cb8f0177a59342749c7
Tyler Gunn [Fri, 11 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Merge changes from topic 'call-session-may'
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Nate Fischer [Fri, 11 Aug 2017 18:10:52 +0000 (18:10 +0000)]
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev am:
a9732da1f3
am:
e1a8030fc9
Change-Id: Ic6af76454398ab9934e635759f7271ad28313e08
Neil Fuller [Fri, 11 Aug 2017 18:06:46 +0000 (18:06 +0000)]
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
am:
252efbcf40
Change-Id: I41d4e0d8c0fbf0eb1bdf0d1722da3626e0b97213
Nate Fischer [Fri, 11 Aug 2017 18:04:45 +0000 (18:04 +0000)]
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev am:
070e3c0c7f
am:
56a9c82325
Change-Id: If3247f4b91fc4b8d3dce2d8c77a3976260a69f34
Steven Moreland [Fri, 11 Aug 2017 17:57:59 +0000 (10:57 -0700)]
Fix android_os_Debug nativehelper headers.
Test: links
Bug:
63762847
Change-Id: I3936b4b7021597de7289ace62ebf9946d2db339c
Nate Fischer [Fri, 11 Aug 2017 17:53:47 +0000 (17:53 +0000)]
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev
am:
a9732da1f3
Change-Id: I38c1ea8090d96861cf2f9a261d9e350766a672ce
Steven Moreland [Fri, 11 Aug 2017 17:52:35 +0000 (10:52 -0700)]
Reference ScopedUtfChar header correctly.
Bug:
63762847
Test: finds header in proper location
Change-Id: I4963ab3133c405a90564112f0d9af602ace0eab5
Neil Fuller [Fri, 11 Aug 2017 17:50:58 +0000 (17:50 +0000)]
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
Kevin Chyn [Fri, 11 Aug 2017 17:49:51 +0000 (17:49 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am:
60409a9255
am:
4b7539e42b
Change-Id: Ib778ed967d874e3eb4ccc3645adcc5d38c08996f
Nate Fischer [Fri, 11 Aug 2017 17:49:24 +0000 (17:49 +0000)]
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev
am:
070e3c0c7f
Change-Id: Ia0405fb1d7a4410100c5c9c98ed64655f06c9e8b
TreeHugger Robot [Fri, 11 Aug 2017 17:38:11 +0000 (17:38 +0000)]
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev
Nate Fischer [Fri, 11 Aug 2017 17:36:42 +0000 (17:36 +0000)]
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev
Kevin Chyn [Fri, 11 Aug 2017 17:34:20 +0000 (17:34 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am:
60409a9255
Change-Id: I19afe423ad9a4f0c9897dd82802e37412072e55c
OSDN Git Service
