Commit Graph

325557 Commits

Author SHA1 Message Date
TreeHugger Robot
39d69b84c9 Merge "AAPT2: Do not interpret %n as a format specifier in string resources" 2017-06-06 21:40:00 +00:00
TreeHugger Robot
d131f19c50 Merge "Add new haptic feedback constant for virtual key release." 2017-06-06 21:35:51 +00:00
Christopher Tate
e5ef67692e Merge "Fix #62350081 - annotate permission requirements" into oc-dev am: 42abe82bbb
am: 169a884f81

Change-Id: I87140161d20185cd94a6b8b714ae90c5c5b9a773
2017-06-06 20:43:28 +00:00
Jorim Jaggi
20bc608dcc Fix issue with dialer launch transition am: db93133782
am: 1a5f0c7ca8

Change-Id: Id8384736c70d82b9ef95e4cb805dde08f039dc04
2017-06-06 20:41:13 +00:00
Daniel Nishi
62d4642c2c Merge "Change storage manager default to be a config." 2017-06-06 20:37:41 +00:00
TreeHugger Robot
12741cec2d Merge "Implement CacheManager for the Skia pipelines." 2017-06-06 20:37:08 +00:00
Christopher Tate
169a884f81 Merge "Fix #62350081 - annotate permission requirements" into oc-dev
am: 42abe82bbb

Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
2017-06-06 20:32:55 +00:00
Jorim Jaggi
1a5f0c7ca8 Fix issue with dialer launch transition
am: db93133782

Change-Id: Id1808ca8d1f2547ecb85679c4b7697ee37f69d9f
2017-06-06 20:30:08 +00:00
TreeHugger Robot
ae6455957b Merge "Initial support for proposed android.net.lowpan" 2017-06-06 20:25:54 +00:00
Etan Cohen
ea3d9d1b42 Merge "[P2P] Add binder to service calls" 2017-06-06 20:20:33 +00:00
TreeHugger Robot
42abe82bbb Merge "Fix #62350081 - annotate permission requirements" into oc-dev 2017-06-06 20:18:21 +00:00
Jorim Jaggi
db93133782 Fix issue with dialer launch transition
Test: Disable assistant, launch dialer on secure keyguard
Test: Launch assistant
Test: Launch camera

Change-Id: Ic3231f5f28fa0cf704b5f5d6e1993b296f14f5a3
Fixes: 38450585
2017-06-06 20:13:09 +00:00
Bryce Lee
bc609a67d7 Merge "Associate freezing display with a target display id." into oc-dev am: 1795242288
am: 2112d52636

Change-Id: I63bef7c4871117bd22bf552da696a20b889d27cb
2017-06-06 20:05:05 +00:00
Adam Lesinski
b9f0548341 AAPT2: Do not interpret %n as a format specifier in string resources
%n is a special value marking a platform independent newline and is
not to be considered a format argument.

Bug: 37132275
Test: make aapt2_tests
Change-Id: I806521e44afe20004344dee9f18ecee6cc7086ea
2017-06-06 20:02:38 +00:00
Bryce Lee
2112d52636 Merge "Associate freezing display with a target display id." into oc-dev
am: 1795242288

Change-Id: I41ae908e86152f42590fc346db382419c5b0a27b
2017-06-06 19:52:35 +00:00
TreeHugger Robot
63c5c9462a Merge "AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml" 2017-06-06 19:49:52 +00:00
Bryce Lee
1795242288 Merge "Associate freezing display with a target display id." into oc-dev 2017-06-06 19:42:45 +00:00
Matthew Ng
6e450e1a6e Merge "Add back recents staggering entrance animation" into oc-dev am: 229119e06b
am: 9fb7f5f1dc

Change-Id: I5880e105b76bb567a6a1ab90301736a16e1c34c8
2017-06-06 19:34:36 +00:00
Matthew Ng
9fb7f5f1dc Merge "Add back recents staggering entrance animation" into oc-dev
am: 229119e06b

Change-Id: I4516daadd7ec9ceba523b3b6e1d58f6843c7600d
2017-06-06 19:24:43 +00:00
TreeHugger Robot
229119e06b Merge "Add back recents staggering entrance animation" into oc-dev 2017-06-06 19:09:18 +00:00
Sundeep Ghuman
965fbb5584 Merge "Don't show unset score values for AccessPoints." into oc-dev am: 32c65fccaf
am: 1e61697d3c  -s ours

Change-Id: I5b58c7052570ff8c6681bb19c8309e86a118425e
2017-06-06 19:03:10 +00:00
Jian Sun
2ca9937f79 Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev am: f1946baae7
am: c3c3112806

Change-Id: I82589c5cf90d8dbb02bab757d58e8584bd05bdb8
2017-06-06 19:00:17 +00:00
Sundeep Ghuman
1e61697d3c Merge "Don't show unset score values for AccessPoints." into oc-dev
am: 32c65fccaf

Change-Id: I40586bcf4ab1fc32a15c145798460008ded764d1
2017-06-06 18:51:54 +00:00
Jian Sun
c3c3112806 Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
am: f1946baae7

Change-Id: Iacba4bd641367f5cf64bcd4d7098bba05fca835d
2017-06-06 18:48:33 +00:00
TreeHugger Robot
32c65fccaf Merge "Don't show unset score values for AccessPoints." into oc-dev 2017-06-06 18:45:18 +00:00
TreeHugger Robot
98a995b78f Merge "Add SLOW network and remove deprecated enums." 2017-06-06 18:41:54 +00:00
Robert Quattlebaum
557e0c38b9 NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.

Bug: b/33073713
Change-Id: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
2017-06-06 18:38:31 +00:00
Jian Sun
f1946baae7 Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev 2017-06-06 18:30:12 +00:00
Derek Sollenberger
f9e45d1d81 Implement CacheManager for the Skia pipelines.
The core of the implementation is complete and provides heuristic
cache sizing based on the size of the surface being used. This CL
will also be used to add the following features in the future...

1) Support Vulkan pipeline reporting on the size of the surface.
2) Complete the VectorDrawableAtlas stub code
3) Automatic purging of stale resources for low memory devices.

Test: hwui_unit_tests (new test added) and CtsUiRendering
Bug: 62260637
Change-Id: Ib85159cca28b646fe249f2190b07f1b7e0f50d8f
2017-06-06 14:19:37 -04:00
Adam Lesinski
7a917a27ef AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml
Bug: 62189611
Test: make AaptTestAppOne
Change-Id: Ic090e4a002b24f2289f47dfba7439638e5848062
2017-06-06 18:14:48 +00:00
Wale Ogunwale
d034fec9cf Merge "Don't allow removed DividerView to resize stack" into oc-dev am: d7427d5d90
am: b4f383c26e

Change-Id: Ibded63bebba40bc29978dee2717dd61a36d609a9
2017-06-06 18:08:49 +00:00
Wale Ogunwale
b4f383c26e Merge "Don't allow removed DividerView to resize stack" into oc-dev
am: d7427d5d90

Change-Id: I6dfe65d2d3e2c69be14b472dcd3e28389e70655f
2017-06-06 17:53:46 +00:00
TreeHugger Robot
d7427d5d90 Merge "Don't allow removed DividerView to resize stack" into oc-dev 2017-06-06 17:46:37 +00:00
Sundeep Ghuman
8a43704a26 Don't show unset score values for AccessPoints.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed

Bug: b/3692675
Test: Visual confirmation
Change-Id: I52909bf55e6efabd2be6c17542f2a15135d25c62
2017-06-06 10:33:06 -07:00
Etan Cohen
af3022347f [P2P] Add binder to service calls
Bug: 33040182
Test: unit tests, run-time behavior
Change-Id: Ic383efc858bb4454d99c98ab24365c63ad3e7f54
2017-06-06 17:23:44 +00:00
TreeHugger Robot
cd8c82a1dc Merge "Add logging metrics for ConfigureKeyGuardDialog" 2017-06-06 17:17:11 +00:00
Chen Xu
fb463c7914 Merge "new strings to support vzw roaming feature" 2017-06-06 17:14:10 +00:00
Makoto Onuki
a6e0addc26 Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am: a9c185f6e7
am: a178d194f9

Change-Id: Iec712211a2c83798ae160560d1cca9ce23b7e577
2017-06-06 17:00:17 +00:00
Makoto Onuki
a178d194f9 Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
am: a9c185f6e7

Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a
2017-06-06 16:44:59 +00:00
Makoto Onuki
a9c185f6e7 Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev 2017-06-06 16:26:10 +00:00
Jeff Sharkey
28f6dc9512 Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37
am: 67cb5f5210

Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216
2017-06-06 16:17:39 +00:00
Android Build Merger (Role)
3de8df76b5 Merge "Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6 am: 0ffff6a341" 2017-06-06 16:12:55 +00:00
Rebecca Silberstein
4ee03a919d Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6
am: 0ffff6a341

Change-Id: I84c310c491dff17f193e8e7942c2ba90798e65b9
2017-06-06 16:11:46 +00:00
Android Build Merger (Role)
b8d32cbd88 Merge "Merge "Coordinate configuration changes and window frame size." into oc-dev am: 749cbb1911 am: 42e95f8b54" 2017-06-06 16:11:21 +00:00
Bryce Lee
906fdb24e6 Merge "Coordinate configuration changes and window frame size." into oc-dev am: 749cbb1911
am: 42e95f8b54

Change-Id: I6ecf592612f5c9d54c37ae9df9525b2f9e14826d
2017-06-06 16:10:17 +00:00
Android Build Merger (Role)
d6c4bb78c7 Merge "Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40 am: e468747115 am: 2fa69bdfce -s ours" 2017-06-06 16:09:54 +00:00
Paul Duffin
7e92e0cc4b Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40 am: e468747115
am: 2fa69bdfce  -s ours

Change-Id: I2559922e3e55d0b64dea38646836fe3ab8ee7fd0
2017-06-06 16:08:43 +00:00
Android Build Merger (Role)
4dd37e4ff8 Merge "Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b am: e2018a407a am: 6ce08f623c" 2017-06-06 16:08:03 +00:00
Erik Kline
f40e6bcd2e Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b am: e2018a407a
am: 6ce08f623c

Change-Id: Ia290ef28f466d6a5c3f7208b1bc078bd7a2c204a
2017-06-06 16:06:43 +00:00
Android Build Merger (Role)
6c8fc3c7bc Merge "Merge "Revert "Disabled task snapshot for TV"" into oc-dev am: faf86491e9 am: 8212cdfb40" 2017-06-06 16:06:18 +00:00