OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Improve swipe to show notification menu gesture" into oc-dev
Mady Mellor [Thu, 27 Apr 2017 17:07:58 +0000 (17:07 +0000)]
Merge "Improve swipe to show notification menu gesture" into oc-dev
am: aa94a61c56

Change-Id: I8221d18deed280c08d93739bcaf24bca0454b302

7 years agoMerge "Better handle MSIM DDS changed event" am: 4418eb4ddf am: 8a3f025d71
Brad Ebinger [Thu, 27 Apr 2017 17:03:20 +0000 (17:03 +0000)]
Merge "Better handle MSIM DDS changed event" am: 4418eb4ddf am: 8a3f025d71
am: 71f70d6685

Change-Id: I55cac364221c728ad1c77be783c358e8d98ec2b4

7 years agoMerge "Improve swipe to show notification menu gesture" into oc-dev
Mady Mellor [Thu, 27 Apr 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Improve swipe to show notification menu gesture" into oc-dev

7 years agoMerge "Better handle MSIM DDS changed event" am: 4418eb4ddf
Brad Ebinger [Thu, 27 Apr 2017 16:54:26 +0000 (16:54 +0000)]
Merge "Better handle MSIM DDS changed event" am: 4418eb4ddf
am: 8a3f025d71

Change-Id: Ib5c64fdc6bdb456c811e374c910bcc595e554b1b

7 years agoMerge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
Wale Ogunwale [Thu, 27 Apr 2017 16:52:33 +0000 (16:52 +0000)]
Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
am: 039dcadc88

Change-Id: Id1b9f4a540a39046b365fbbf10431b86f6af63f1

7 years agoMerge "Better handle MSIM DDS changed event"
Brad Ebinger [Thu, 27 Apr 2017 16:46:54 +0000 (16:46 +0000)]
Merge "Better handle MSIM DDS changed event"
am: 4418eb4ddf

Change-Id: Ibadbaec61808e571ebbd1c0c2ac90cf3c5141a57

7 years agoMerge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 16:42:59 +0000 (16:42 +0000)]
Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev

7 years agoMerge "Better handle MSIM DDS changed event"
Brad Ebinger [Thu, 27 Apr 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Better handle MSIM DDS changed event"

7 years agoMerge "Support profile global restrictions in disclosure messages." into oc-dev
Pavel Grafov [Thu, 27 Apr 2017 16:33:49 +0000 (16:33 +0000)]
Merge "Support profile global restrictions in disclosure messages." into oc-dev
am: b258552a1c

Change-Id: Ie8d9e4d8f43274aa1bba1df66a9f0fda34d0e78b

7 years agoMerge "Support profile global restrictions in disclosure messages." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 16:23:00 +0000 (16:23 +0000)]
Merge "Support profile global restrictions in disclosure messages." into oc-dev

7 years agoMerge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am: 0b711e2c86 am: aab168b7cc
Narayan Kamath [Thu, 27 Apr 2017 15:45:22 +0000 (15:45 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am: 0b711e2c86 am: aab168b7cc
am: 0ddced5c44

Change-Id: I223e6167bcb5228a5175ebf7308b40a8f974e3d8

7 years agoMerge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am: 0b711e2c86
Narayan Kamath [Thu, 27 Apr 2017 15:40:19 +0000 (15:40 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am: 0b711e2c86
am: aab168b7cc

Change-Id: Iceab938d11cc334c8ffaa4321623f72b9f7cfaa8

7 years agoMerge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"
Narayan Kamath [Thu, 27 Apr 2017 15:35:46 +0000 (15:35 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"
am: 0b711e2c86

Change-Id: I35050e29b7de414aa60a920d20c677028102d8ca

7 years agoMerge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"
Narayan Kamath [Thu, 27 Apr 2017 15:26:50 +0000 (15:26 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"

7 years agoMerge "New constant for new settings screen." into oc-dev
Julia Reynolds [Thu, 27 Apr 2017 15:23:52 +0000 (15:23 +0000)]
Merge "New constant for new settings screen." into oc-dev
am: 04225787d8

Change-Id: Ie4d14f5f2954c40dcdedac8dd028e31d380eb881

7 years agoMerge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
Stefan Ramsauer [Thu, 27 Apr 2017 15:17:16 +0000 (15:17 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
am: ba9ab17434

Change-Id: I9d8025f6eec133ba914a43acf0fce7ddcbf6e6af

7 years agoMerge "New constant for new settings screen." into oc-dev
Julia Reynolds [Thu, 27 Apr 2017 15:11:32 +0000 (15:11 +0000)]
Merge "New constant for new settings screen." into oc-dev

7 years agoMerge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev
Stefan Ramsauer [Thu, 27 Apr 2017 15:09:21 +0000 (15:09 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev

7 years agoNew constant for new settings screen.
Julia Reynolds [Sun, 23 Apr 2017 16:27:07 +0000 (12:27 -0400)]
New constant for new settings screen.

Bug: 36561295
Test: make
Change-Id: I0e2ec6d7b372a9594f8b583540804dde1b79de1a

7 years agoMerge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
Jason Monk [Thu, 27 Apr 2017 14:51:09 +0000 (14:51 +0000)]
Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
am: 24370bfd30

Change-Id: Ic3e25e78d3916f8939cca1ca7b449787e788fde8

7 years agoMerge "Revert "Status bar updates" DO NOT MERGE" into oc-dev
Jason Monk [Thu, 27 Apr 2017 14:43:46 +0000 (14:43 +0000)]
Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev

7 years agoRevert "Status bar updates" DO NOT MERGE
Jason Monk [Wed, 26 Apr 2017 18:35:24 +0000 (14:35 -0400)]
Revert "Status bar updates" DO NOT MERGE

Test: runtest systemui
Fixes: 37626598
This reverts commit d1ba5fbb54a02fad0c68f71183078527bfa9bd49.

Change-Id: I12c70b67fafd46ec98b1c1ee28b911e19afbf6e5

7 years agoMerge "Address API council feedback." into oc-dev
George Mount [Thu, 27 Apr 2017 14:18:10 +0000 (14:18 +0000)]
Merge "Address API council feedback." into oc-dev
am: 4a71842dbd

Change-Id: Ia9511f1031463b6e65437e27e6012b8e83e8961d

7 years agoMerge "Address API council feedback." into oc-dev
George Mount [Thu, 27 Apr 2017 14:06:10 +0000 (14:06 +0000)]
Merge "Address API council feedback." into oc-dev

7 years agoMerge "SmartSelection: Use downloaded model file." into oc-dev
Abodunrinwa Toki [Thu, 27 Apr 2017 13:58:36 +0000 (13:58 +0000)]
Merge "SmartSelection: Use downloaded model file." into oc-dev
am: a97608caa8

Change-Id: If5dbd82ad5150a1d4f3cfe35dd7325468f36a94c

7 years agoMerge "Guard against incorrect context use." into oc-dev
Jason Monk [Thu, 27 Apr 2017 13:56:42 +0000 (13:56 +0000)]
Merge "Guard against incorrect context use." into oc-dev
am: 2cddbcaa0f

Change-Id: Ia2905116802bf9d1ed88abb75aefded34d130853

7 years agoMerge "SmartSelection: Use downloaded model file." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 13:50:52 +0000 (13:50 +0000)]
Merge "SmartSelection: Use downloaded model file." into oc-dev

7 years agoMerge "Guard against incorrect context use." into oc-dev
Jason Monk [Thu, 27 Apr 2017 13:46:48 +0000 (13:46 +0000)]
Merge "Guard against incorrect context use." into oc-dev

7 years agoMerge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev
Narayan Kamath [Thu, 27 Apr 2017 13:43:50 +0000 (13:43 +0000)]
Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev
am: 2e0e7f3c94

Change-Id: I14acd4352f04f16294bfc1b97c2ad9a0b9a533d4

7 years agoMerge "Create a metrics events for ag/2085657 (DO disclosure screens)" into oc-dev
Denis Kuznetsov [Thu, 27 Apr 2017 13:35:55 +0000 (13:35 +0000)]
Merge "Create a metrics events for ag/2085657 (DO disclosure screens)" into oc-dev
am: 28f9ada2ac

Change-Id: Id024cab7c0edc1ebf8626f671ac281f68d71e86f

7 years agoMerge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev
Narayan Kamath [Thu, 27 Apr 2017 13:30:30 +0000 (13:30 +0000)]
Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev

7 years agoMerge "Create a metrics events for ag/2085657 (DO disclosure screens)" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 13:26:21 +0000 (13:26 +0000)]
Merge "Create a metrics events for ag/2085657 (DO disclosure screens)" into oc-dev

7 years agoMerge "NsdManager: unit tests for argument validation" am: 3cff7deecb am: d97e358f7a
Hugo Benichi [Thu, 27 Apr 2017 13:09:02 +0000 (13:09 +0000)]
Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb am: d97e358f7a
am: 48947de481

Change-Id: I8a51ff51071adc60fe9f4d99ec629edabbed353d

7 years agoMerge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20 am...
Hugo Benichi [Thu, 27 Apr 2017 13:06:59 +0000 (13:06 +0000)]
Merge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20 am: 47748b754c
am: 5d0bd13538

Change-Id: Ic8ddf92c7c64d4214a75bea6d6e5083f4612a76a

7 years agoresolve merge conflicts of 01f050f21fb2 to oc-dev-plus-aosp
Nicolas Geoffray [Thu, 27 Apr 2017 12:56:20 +0000 (13:56 +0100)]
resolve merge conflicts of 01f050f21fb2 to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: If3796f456fa80c2f9c649855d39f4dab01e54f3c

7 years agoMerge "NsdManager: unit tests for argument validation" am: 3cff7deecb
Hugo Benichi [Thu, 27 Apr 2017 12:49:36 +0000 (12:49 +0000)]
Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb
am: d97e358f7a

Change-Id: Ibd6090d57908da159409bd1e886914446e6ba2da

7 years agoMerge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20
Hugo Benichi [Thu, 27 Apr 2017 12:44:37 +0000 (12:44 +0000)]
Merge "NsdService: disentangle NativeDaemonConnector from ctor" am: fa97f11b20
am: 47748b754c

Change-Id: Ie66587e82e13957d4a802699f78c41a1bce378b2

7 years agoMerge "NsdManager: unit tests for argument validation"
Hugo Benichi [Thu, 27 Apr 2017 12:44:35 +0000 (12:44 +0000)]
Merge "NsdManager: unit tests for argument validation"
am: 3cff7deecb

Change-Id: I24d3bda00236fe8c49df0ea7f53109625b3b4f9d

7 years agoMerge "NsdService: disentangle NativeDaemonConnector from ctor"
Hugo Benichi [Thu, 27 Apr 2017 12:39:00 +0000 (12:39 +0000)]
Merge "NsdService: disentangle NativeDaemonConnector from ctor"
am: fa97f11b20

Change-Id: I4e5dc9df1f4de256b34c0140ea5ae7ec1bb6fce6

7 years agoMerge "NsdManager: unit tests for argument validation"
Hugo Benichi [Thu, 27 Apr 2017 12:36:41 +0000 (12:36 +0000)]
Merge "NsdManager: unit tests for argument validation"

7 years agoMerge "NsdService: disentangle NativeDaemonConnector from ctor"
Hugo Benichi [Thu, 27 Apr 2017 12:30:20 +0000 (12:30 +0000)]
Merge "NsdService: disentangle NativeDaemonConnector from ctor"

7 years agoMerge "Update frameworks/base to new compiler filters." am: 431bc34096
Nicolas Geoffray [Thu, 27 Apr 2017 11:57:54 +0000 (11:57 +0000)]
Merge "Update frameworks/base to new compiler filters." am: 431bc34096
am: fee9c65f40

Change-Id: I19bfb0fff74e9660029f8a6eee4dd010d2f6c702

7 years agoMerge "Update frameworks/base to new compiler filters."
Nicolas Geoffray [Thu, 27 Apr 2017 11:51:02 +0000 (11:51 +0000)]
Merge "Update frameworks/base to new compiler filters."
am: 431bc34096

Change-Id: I2eb42fb2aad718f71c8c0a7a81ca4e17d0aaa9c5

7 years agoMerge "Update frameworks/base to new compiler filters."
Nicolas Geoffray [Thu, 27 Apr 2017 11:40:05 +0000 (11:40 +0000)]
Merge "Update frameworks/base to new compiler filters."

7 years agoCreate a metrics events for ag/2085657 (DO disclosure screens)
Denis Kuznetsov [Thu, 13 Apr 2017 09:41:33 +0000 (11:41 +0200)]
Create a metrics events for ag/2085657 (DO disclosure screens)

Bug: 32692748
Test: Tests for functional changes are in ag/2085657
Change-Id: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
Merged-In: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
(cherry picked from commit 7152a41d25f0296ec5ed41c497f7666e185890eb)

7 years agoMerge "Deprecate internal Calendar methods." into oc-dev
Joachim Sauer [Thu, 27 Apr 2017 10:57:40 +0000 (10:57 +0000)]
Merge "Deprecate internal Calendar methods." into oc-dev
am: ccac69e11a

Change-Id: I255eab1358585094b43d21a21b3feab578a97e4f

7 years agoSupport profile global restrictions in disclosure messages.
Pavel Grafov [Fri, 21 Apr 2017 19:03:26 +0000 (20:03 +0100)]
Support profile global restrictions in disclosure messages.

Starting from Android O ENSURE_VERIFY_APPS can be enforced globally
by profile owners. To take this into account, this CL uses newer
UserManager API for getting a list of enforcing admins with their
userIds instead of just a mask.

Bug: 37158436
Test: manually
Change-Id: Id18b365668373b5aa28d59fcc4d662a2f5d133d8

7 years agoMerge "Deprecate internal Calendar methods." into oc-dev
Joachim Sauer [Thu, 27 Apr 2017 10:49:40 +0000 (10:49 +0000)]
Merge "Deprecate internal Calendar methods." into oc-dev

7 years agoMerge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
Tony Mak [Thu, 27 Apr 2017 09:49:14 +0000 (09:49 +0000)]
Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
am: 424dd39e25

Change-Id: I5e0f9a3f556ae0a078577e68694054ead19d268a

7 years agoMerge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN...
Tony Mak [Thu, 27 Apr 2017 09:48:13 +0000 (09:48 +0000)]
Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev
am: f4362fda59

Change-Id: I130dc84ecfb47263679f6645a0b243f047c04e33

7 years agoMerge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 09:41:08 +0000 (09:41 +0000)]
Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev

7 years agoMerge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN...
TreeHugger Robot [Thu, 27 Apr 2017 09:41:08 +0000 (09:41 +0000)]
Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev

7 years agoNsdManager: unit tests for argument validation
Hugo Benichi [Tue, 25 Apr 2017 06:04:10 +0000 (15:04 +0900)]
NsdManager: unit tests for argument validation

Test: new tests pass.
Bug: 3701336933298084
Change-Id: Ia514d2bbd967d46fed54e379f319b572ade22c62

7 years agoNsdService: disentangle NativeDaemonConnector from ctor
Hugo Benichi [Mon, 24 Apr 2017 07:19:58 +0000 (16:19 +0900)]
NsdService: disentangle NativeDaemonConnector from ctor

This patch disentangles the creation of NativeDaemonConnector from the
creation of NsdService by introducing a wrapper type DaemonConnection.

This allows to mock this dependency in unit tests.

Test: enhanced previously introduced new tests.
Bug: 3701336933298084
Change-Id: I894b7cddfc509f86d0134d214c88c063b81b5e0a

7 years agoMerge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using...
Kang Li [Thu, 27 Apr 2017 07:33:39 +0000 (07:33 +0000)]
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev
am: 6b36aeb491

Change-Id: Id08aa99bc81d260731fae25457b30e648171b291

7 years agoMerge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using...
TreeHugger Robot [Thu, 27 Apr 2017 07:26:09 +0000 (07:26 +0000)]
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev

7 years agoMerge "Address API Council feedback." into oc-dev
Steve McKay [Thu, 27 Apr 2017 06:33:19 +0000 (06:33 +0000)]
Merge "Address API Council feedback." into oc-dev
am: f147688149

Change-Id: I3f4e3f74058b1f1e0af4cf5a2c095fb0c265c003

7 years agoMerge "Address API Council feedback." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 06:26:00 +0000 (06:26 +0000)]
Merge "Address API Council feedback." into oc-dev

7 years agoMerge "Expose Companion API via shell command" into oc-dev
Eugene Susla [Thu, 27 Apr 2017 06:03:59 +0000 (06:03 +0000)]
Merge "Expose Companion API via shell command" into oc-dev
am: 60c17e06e8

Change-Id: I0d8301000f9fef4a2c13ae64798d13bb16029878

7 years agoMerge "Expose Companion API via shell command" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:55:58 +0000 (05:55 +0000)]
Merge "Expose Companion API via shell command" into oc-dev

7 years agoMerge "NsdService: bootstrap unit tests" am: 7ca060aa95 am: dd53c962b2
Hugo Benichi [Thu, 27 Apr 2017 05:49:47 +0000 (05:49 +0000)]
Merge "NsdService: bootstrap unit tests" am: 7ca060aa95 am: dd53c962b2
am: d29ce6ae8c

Change-Id: Iaf0679790e934baaaf48bcb04098aa18deca4d60

7 years agoMerge "NsdService: bootstrap unit tests" am: 7ca060aa95
Hugo Benichi [Thu, 27 Apr 2017 05:42:36 +0000 (05:42 +0000)]
Merge "NsdService: bootstrap unit tests" am: 7ca060aa95
am: dd53c962b2

Change-Id: If2782297ecd3b6bef8d8be5b1427aed8fcdb7aee

7 years agoMerge "NsdService: bootstrap unit tests"
Hugo Benichi [Thu, 27 Apr 2017 05:34:05 +0000 (05:34 +0000)]
Merge "NsdService: bootstrap unit tests"
am: 7ca060aa95

Change-Id: I3ce2d85afb5e085c8c49731f3d18a96d17542271

7 years agoMerge "docs: Update EditText JavaDoc comments" into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 05:33:23 +0000 (05:33 +0000)]
Merge "docs: Update EditText JavaDoc comments" into oc-dev
am: cc7f08e997

Change-Id: I756fae9374b0bd2f30c7c1a856acdc09fe249adb

7 years agoMerge "docs: Update Button JavaDoc comments" into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 05:31:24 +0000 (05:31 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev
am: 1e5d0768cd

Change-Id: Ice1626bc12b0b605a97c8d921c352c5e600bc43a

7 years agoMerge "docs: Update EditText JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:24:46 +0000 (05:24 +0000)]
Merge "docs: Update EditText JavaDoc comments" into oc-dev

7 years agoMerge "NsdService: bootstrap unit tests"
Hugo Benichi [Thu, 27 Apr 2017 05:22:52 +0000 (05:22 +0000)]
Merge "NsdService: bootstrap unit tests"

7 years agoMerge "docs: Update Button JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 05:21:17 +0000 (05:21 +0000)]
Merge "docs: Update Button JavaDoc comments" into oc-dev

7 years agoMerge "Autofill binding permission fixes." into oc-dev
Felipe Leme [Thu, 27 Apr 2017 05:11:38 +0000 (05:11 +0000)]
Merge "Autofill binding permission fixes." into oc-dev
am: d915c42150

Change-Id: I355fe15bed198f2db1bd819bbeb138be9bea56d2

7 years agoMerge "Api updates" into oc-dev
Julia Reynolds [Thu, 27 Apr 2017 05:04:18 +0000 (05:04 +0000)]
Merge "Api updates" into oc-dev
am: f84467e19f

Change-Id: I136a7713ee8f2b625b58aac29f5315c5b336256b

7 years agoMerge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
Peng Xu [Thu, 27 Apr 2017 05:00:12 +0000 (05:00 +0000)]
Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
am: 3ab258c98d

Change-Id: I2c36bf36a085f9c4535d74dc3245abfe56a2b322

7 years agoMerge "Autofill binding permission fixes." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Autofill binding permission fixes." into oc-dev

7 years agoMerge "Api updates" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:51:37 +0000 (04:51 +0000)]
Merge "Api updates" into oc-dev

7 years agoMerge "Fix volume key events are dispatched when screen is off" into oc-dev
David Lin [Thu, 27 Apr 2017 04:50:55 +0000 (04:50 +0000)]
Merge "Fix volume key events are dispatched when screen is off" into oc-dev
am: 0db47f9364

Change-Id: I0a7c23f9ad342de17a427c0f22ab683d727a3166

7 years agoMerge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev
Peng Xu [Thu, 27 Apr 2017 04:49:11 +0000 (04:49 +0000)]
Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev

7 years agoMerge "Fix volume key events are dispatched when screen is off" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:46:29 +0000 (04:46 +0000)]
Merge "Fix volume key events are dispatched when screen is off" into oc-dev

7 years agoMerge "docs: Update ScrollView JavaDoc comments" into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 04:42:27 +0000 (04:42 +0000)]
Merge "docs: Update ScrollView JavaDoc comments" into oc-dev
am: 47ca22e361

Change-Id: I420d715eb686c1a27f888a394d764358cb227df6

7 years agoMerge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 04:40:19 +0000 (04:40 +0000)]
Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
am: b312d38868

Change-Id: I1452e7e30f5eea7da222b093b0e8d6d1fb400c10

7 years agoMerge "Handle package changes in autofill manager service" into oc-dev
Svet Ganov [Thu, 27 Apr 2017 04:36:08 +0000 (04:36 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev
am: 01d51288df

Change-Id: Idcc327443e903d7b5b09526babf62426e3b83291

7 years agoMerge "docs: Update LinearLayout JavaDoc comments" into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 04:33:16 +0000 (04:33 +0000)]
Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev
am: ca105f6c29

Change-Id: I474bae032506243df9035056155fc0738f49e445

7 years agoMerge "docs: Update ProgressBar JavaDoc comments" into oc-dev
Joe Fernandez [Thu, 27 Apr 2017 04:31:10 +0000 (04:31 +0000)]
Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev
am: 80fe019f6b

Change-Id: Ia821d6edb1c0c1b44b7a1f33490c4046d81ff2cc

7 years agoMerge "docs: Update ScrollView JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:29:09 +0000 (04:29 +0000)]
Merge "docs: Update ScrollView JavaDoc comments" into oc-dev

7 years agoMerge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:28:31 +0000 (04:28 +0000)]
Merge "docs: Update RelativeLayout.LayoutParams JavaDoc comments" into oc-dev

7 years agoMerge "Handle package changes in autofill manager service" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:22:20 +0000 (04:22 +0000)]
Merge "Handle package changes in autofill manager service" into oc-dev

7 years agoMerge "docs: Update LinearLayout JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:21:09 +0000 (04:21 +0000)]
Merge "docs: Update LinearLayout JavaDoc comments" into oc-dev

7 years agoMerge "Blame services for slow operations" into oc-dev
Fyodor Kupolov [Thu, 27 Apr 2017 04:14:24 +0000 (04:14 +0000)]
Merge "Blame services for slow operations" into oc-dev
am: 3acd16b43d

Change-Id: I17dabe18c63f1743b8b7586f27e4c3a16d7303b0

7 years agoMerge "docs: Update ProgressBar JavaDoc comments" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 04:12:44 +0000 (04:12 +0000)]
Merge "docs: Update ProgressBar JavaDoc comments" into oc-dev

7 years agoMerge "Add device ID attestation method to keymaster" into oc-dev
Bartosz Fabianowski [Thu, 27 Apr 2017 04:04:45 +0000 (04:04 +0000)]
Merge "Add device ID attestation method to keymaster" into oc-dev
am: 9138c5dfa7

Change-Id: I27c7bd606df0c584d897523c787ae684e9c0c30c

7 years agoMerge "Call getAllowedUid on a separate thread" into oc-dev
Fyodor Kupolov [Thu, 27 Apr 2017 04:00:09 +0000 (04:00 +0000)]
Merge "Call getAllowedUid on a separate thread" into oc-dev
am: 21c34e2b50

Change-Id: I7df45a4b0124b68e049bd0b80f7ab6cef2cda4d1

7 years agoMerge "Blame services for slow operations" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:59:53 +0000 (03:59 +0000)]
Merge "Blame services for slow operations" into oc-dev

7 years agoMerge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
Erik Kline [Thu, 27 Apr 2017 03:58:12 +0000 (03:58 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
am: 40ccb1b5aa

Change-Id: Ie883f62bdc731c8da3b3d5ac1df827e1fd5b44be

7 years agoMerge "Add device ID attestation method to keymaster" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:51:29 +0000 (03:51 +0000)]
Merge "Add device ID attestation method to keymaster" into oc-dev

7 years agoMerge "Call getAllowedUid on a separate thread" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:50:47 +0000 (03:50 +0000)]
Merge "Call getAllowedUid on a separate thread" into oc-dev

7 years agoMerge "Clarify some IpManager/ApfFilter debugging output." into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 03:45:50 +0000 (03:45 +0000)]
Merge "Clarify some IpManager/ApfFilter debugging output." into oc-dev

7 years agoMerge "Drop uses-feature requirement for system process" into oc-dev
Svetoslav Ganov [Thu, 27 Apr 2017 03:06:14 +0000 (03:06 +0000)]
Merge "Drop uses-feature requirement for system process" into oc-dev
am: 8ba6fdb3fa

Change-Id: Ic306e331e0eac1d8559cea71a56211eaadbf35e1

7 years agoMerge "Drop uses-feature requirement for system process" into oc-dev
Svetoslav Ganov [Thu, 27 Apr 2017 03:01:55 +0000 (03:01 +0000)]
Merge "Drop uses-feature requirement for system process" into oc-dev

7 years ago[Stability]: fix system_server crash issue caused by fd leak.
songjinshi [Wed, 15 Mar 2017 08:16:05 +0000 (16:16 +0800)]
[Stability]: fix system_server crash issue caused by fd leak.

If an app incorrect use of registerListener, it will cause
system_server socket fd leak, for example:
    protected void onResume() {
        super.onResume();
        mSensorManager.registerListener(new MySensorEventListener(),
                mSensor, SensorManager.SENSOR_DELAY_UI);
Each time a new SensorEventQueue, then in the system_server
will open a new socket fd, as time increases system_server's
fd will be more than 1024 and crash, so we needed add count limit
for sensor listener to improve the system stability.

Test: use the apk attached in the issue
      https://code.google.com/p/android/issues/detail?id=258634
Bug: 37543280

Change-Id: I35006966a1638c25bb0f54611e117e16a764e12b
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
7 years agoHandle package changes in autofill manager service
Svet Ganov [Thu, 27 Apr 2017 01:49:30 +0000 (18:49 -0700)]
Handle package changes in autofill manager service

Autofill manager service was not observing package changes thus
we did not properly handle the cases of the service being updated,
added, and removed. Handling, additions is needed to properly
support restore from a backup. Fixed a few missing locks.

Test: all autofill CTS tests pass and manually tested update, add,
      and remove of autofill services.

bug:36638606
bug:36978445

Change-Id: Idd47891774ba2a4e562a1952cbb5a048211fd4e3

7 years agoMerge "Avoid ClassCastException in ArrayMap." into oc-dev
Daniel Sandler [Thu, 27 Apr 2017 01:31:40 +0000 (01:31 +0000)]
Merge "Avoid ClassCastException in ArrayMap." into oc-dev
am: f9e5395081

Change-Id: I2b8b50865bd6db37092ac5752bf280a74e840074

7 years agoMerge "Avoid ClassCastException in ArrayMap." into oc-dev
Daniel Sandler [Thu, 27 Apr 2017 01:23:52 +0000 (01:23 +0000)]
Merge "Avoid ClassCastException in ArrayMap." into oc-dev