Commit Graph

80840 Commits

Author SHA1 Message Date
kopriva
9c6821025f docs: fixing typo, bug 36909553 am: 4dddc63ee7
am: fdffe0a8be

Change-Id: Ib9c862fc159005c71f4af7c2e8028d588d197a11
2018-03-20 05:26:31 +00:00
Sunny Goyal
1f42bf5b6d Merge "Updating java doc for requestPinAppWidget" into pi-dev
am: dbb0a49f00

Change-Id: I97d558e9dcd3c4e47e7f1e33a7e74e1d1de5aab9
2018-03-20 04:35:27 +00:00
kopriva
fdffe0a8be docs: fixing typo, bug 36909553
am: 4dddc63ee7

Change-Id: Ib943321651422b55b928b90617145a871a0d0460
2018-03-20 04:12:47 +00:00
Alice Sheng
4aa94a7c50 Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev
am: 7723aed494

Change-Id: Ibc6fb095d97e53b9bd95b58e1fbbb77a92d24145
2018-03-20 03:25:22 +00:00
Roshan Pius
265efbd527 Merge "Settings: Remove unused bg scan throttle settings" into pi-dev
am: f4f317798b

Change-Id: Ifb8dcd8b7d98bf427864651d5a80b4d2efbb3d77
2018-03-20 02:31:23 +00:00
Siyamed Sinir
90d17942e1 Merge "Fix rounding error related to autoSize" into pi-dev
am: 46c84bf237

Change-Id: I0c8b7c4b21d0980547025ebd58189a637020b209
2018-03-20 02:23:42 +00:00
Kweku Adams
148d986e62 Merge "Removing the settings-based IncidentReportArgs method." into pi-dev
am: 46c0e91b74

Change-Id: I19be9d6a6c3b1674dada4eaaf36faf2e555a8b79
2018-03-20 02:20:03 +00:00
Sunny Goyal
dbb0a49f00 Merge "Updating java doc for requestPinAppWidget" into pi-dev 2018-03-20 02:07:48 +00:00
Shuzhen Wang
f1b5a2a866 Merge "Camera2: Use Set for physical camera IDs" into pi-dev
am: 83c4690f55

Change-Id: I11c86616264823d52e71e15db350ba6b588099b5
2018-03-20 01:04:20 +00:00
Robert Berry
4d549c21ff Merge "Move trusted CA certs to core" into pi-dev
am: f679bda843

Change-Id: I280586e435a15974dd1658e3e155fe959ccb373e
2018-03-20 00:49:13 +00:00
Andreas Gampe
1833e68f13 Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev
am: 0f8f3f25cf

Change-Id: Ib537886c003f4f4877a1fb4a89ad9ca25f603aea
2018-03-20 00:27:23 +00:00
Android Build Merger (Role)
7bec751fe6 Merge "Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2 am: 9dda91f806" into pi-dev-plus-aosp 2018-03-20 00:09:43 +00:00
Benedict Wong
2e67bf5cac Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2
am: 9dda91f806

Change-Id: Idaab45998f4765655bde6cf0274f2ba3c1b3ecf1
2018-03-20 00:09:15 +00:00
Ajay Nadathur
e9c0e21d44 Merge "Add setupwizard personalisation state to Settings" into pi-dev
am: e9b60f2cd3

Change-Id: Idd6fbd7415316ffe8e6641ec2becb99c6d48329d
2018-03-20 00:07:13 +00:00
Benedict Wong
9dda91f806 Merge "Added implementation for VTI add/remove address"
am: 2543fbd8a2

Change-Id: Id49ef89d3076c9a6d5257b006965844ab77743ce
2018-03-19 23:45:10 +00:00
Selim Cinek
b348343320 Merge "Dispatching display list recreations also to transient views" into pi-dev
am: 036a2409fc

Change-Id: I2efbf117542eda421fa5e263b8b8a410b2b29a65
2018-03-19 23:24:38 +00:00
Adam Powell
d40f30610e Merge "Add factory methods for async Handlers" into pi-dev
am: fa38f238b1

Change-Id: I0dee61e5dbd2a21bbd03c06cde72a66a708bc55f
2018-03-19 23:21:29 +00:00
David Chen
1cc4099e80 Merge "Small fixes to StatsManager API." into pi-dev
am: 96e680cb90

Change-Id: I2d7e2a204c91ed7a824002111452286e5efa4977
2018-03-19 23:16:51 +00:00
Tej Singh
3e39b508f1 Merge "Atoms: Mobile Connection" into pi-dev
am: dba47fcd09

Change-Id: I3008bae7f5ecebbbb79fbe141479d25c6c5f5867
2018-03-19 22:54:01 +00:00
Robert Carr
d0232c6aa2 Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev
am: 89b182890c

Change-Id: I2ad5181dab33597fc9a917bf8cdd0d83e6f0466a
2018-03-19 22:46:11 +00:00
Alice Sheng
7723aed494 Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev 2018-03-19 22:38:25 +00:00
Tracy Zhou
6f9ebab4ed Merge "Move default pip position to right above the shelf." into pi-dev
am: 017f44be88

Change-Id: I0b61860bedd0b949dbd2b2f87b10149c3577559b
2018-03-19 22:37:06 +00:00
Alice Sheng
6750352248 Revert "Add setting for enabling CPU frequency scaling."
This reverts commit 2e8afd8736.

Reason for revert: SELinux Boot crash
Bug: 75974893

Change-Id: I4751530a1b460842130a495efe688aaf19b92638
2018-03-19 22:36:52 +00:00
Felipe Leme
c8ca9aa394 Merge "Fixed isVisibleToUserForAutofill() again." into pi-dev
am: e24c95fac5

Change-Id: I1e1bf92156608ca8c4296145a5ccd9775888dd78
2018-03-19 22:33:14 +00:00
TreeHugger Robot
f4f317798b Merge "Settings: Remove unused bg scan throttle settings" into pi-dev 2018-03-19 22:24:04 +00:00
Siyamed Sinir
46c84bf237 Merge "Fix rounding error related to autoSize" into pi-dev 2018-03-19 22:15:31 +00:00
TreeHugger Robot
46c0e91b74 Merge "Removing the settings-based IncidentReportArgs method." into pi-dev 2018-03-19 22:15:11 +00:00
Benedict Wong
2543fbd8a2 Merge "Added implementation for VTI add/remove address" 2018-03-19 22:05:09 +00:00
TreeHugger Robot
83c4690f55 Merge "Camera2: Use Set for physical camera IDs" into pi-dev 2018-03-19 22:02:58 +00:00
TreeHugger Robot
f679bda843 Merge "Move trusted CA certs to core" into pi-dev 2018-03-19 21:44:23 +00:00
TreeHugger Robot
0f8f3f25cf Merge "Frameworks: Fix Binder.joinThreadPool" into pi-dev 2018-03-19 21:40:37 +00:00
Andreas Gampe
a3c96c1524 Merge "Frameworks: Handle exceptions in SystemProperties callbacks" am: af3dc4fc70
am: bccdf32c8a

Change-Id: Ie640cf1734ff80a19d8c0ba65734f5e76d26fa76
2018-03-19 21:38:59 +00:00
TreeHugger Robot
e9b60f2cd3 Merge "Add setupwizard personalisation state to Settings" into pi-dev 2018-03-19 21:26:37 +00:00
kopriva
4dddc63ee7 docs: fixing typo, bug 36909553
Test: make ds-docs

Bug: 36909553
Change-Id: I6e6842fe555690d97b954c370b777b25c6f5e54e
2018-03-19 14:25:30 -07:00
Andreas Gampe
bccdf32c8a Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
am: af3dc4fc70

Change-Id: Ib7b56bb493be1053d2277a68a1d64010eb7d6033
2018-03-19 21:24:24 +00:00
TreeHugger Robot
036a2409fc Merge "Dispatching display list recreations also to transient views" into pi-dev 2018-03-19 21:09:31 +00:00
Adam Powell
fa38f238b1 Merge "Add factory methods for async Handlers" into pi-dev 2018-03-19 21:09:01 +00:00
TreeHugger Robot
96e680cb90 Merge "Small fixes to StatsManager API." into pi-dev 2018-03-19 21:04:39 +00:00
Seigo Nonaka
efd7a037d0 Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev
am: b3aec698e8

Change-Id: I53dfdbfbd7d9a1278ae1e82e98f21cbddbc0cf55
2018-03-19 20:57:27 +00:00
Felipe Leme
237773621d Merge "Cosmetic changes on Field Classification TODOs and docs." into pi-dev
am: a96583edf6

Change-Id: If54a4c871affdaaf91134760c7948925c419f342
2018-03-19 20:46:58 +00:00
TreeHugger Robot
dba47fcd09 Merge "Atoms: Mobile Connection" into pi-dev 2018-03-19 20:45:55 +00:00
Alice Sheng
4eafb6299d Merge "Add setting for enabling CPU frequency scaling." into pi-dev
am: 1799f2b878

Change-Id: I297da1b2ed52e81bb632842b468237d2b0ed31a9
2018-03-19 20:33:11 +00:00
TreeHugger Robot
89b182890c Merge "SurfaceView: Expose hook for subclass to position child surfaces." into pi-dev 2018-03-19 20:32:35 +00:00
Android Build Merger (Role)
7509f73970 Merge "Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev am: a946d88011" into pi-dev-plus-aosp 2018-03-19 20:19:13 +00:00
Felipe Leme
5bd9587d48 Merge "Fixed AutofillManager.isAutofillUiShowing()" into pi-dev
am: a946d88011

Change-Id: Ie944c93a7586ff1de665d92590a57e541c4b7d1c
2018-03-19 20:18:36 +00:00
Android Build Merger (Role)
0656e40e20 Merge "Merge "Add the AVRCP Target Service (2/2)" am: 61265410e8 am: a33ad4f2bd" into pi-dev-plus-aosp 2018-03-19 20:16:18 +00:00
Ajay Panicker
5b3626573c Merge "Add the AVRCP Target Service (2/2)" am: 61265410e8
am: a33ad4f2bd

Change-Id: I2f34d563e1bf8224a9388701d9d8718d7aec3a0a
2018-03-19 20:15:32 +00:00
Alex Kershaw
c445726833 Merge "Fix Javadoc of DevicePolicyManager#setStorageEncryption to reflect that it's a no-op (and silent fail) when called from a non-system user." into pi-dev
am: 56be97edd0

Change-Id: I26c48173f62c19c437a6f24bd63159f80e3f6fb1
2018-03-19 20:15:31 +00:00
Tracy Zhou
017f44be88 Merge "Move default pip position to right above the shelf." into pi-dev 2018-03-19 20:15:14 +00:00
Ajay Panicker
a33ad4f2bd Merge "Add the AVRCP Target Service (2/2)"
am: 61265410e8

Change-Id: I6174f0e40d0a9bcb0f079b1f0ff87b3a5188bfef
2018-03-19 20:03:32 +00:00