7 Commits

Author	SHA1	Message	Date
Fan Zhang	23f8d59d02	Sort imports ... Having consistent import order will reduce chance of merge conflict between internal and external master Test: rebuild Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b	2018-08-28 22:13:15 +00:00
Pavel Grafov	80d9020cc2	Ask profile password before unifying to prevent untrusted reset ... Test: make -j RunSettingsRoboTests Test: manual, unify when profile lock is compliant Test: manual, unify when profile lock is not compliant Test: manual, unify when profile lock is empty Fixes: 110262879 Change-Id: I0dfa885f2a0e44e09c217b3e7766b367f1340c9e	2018-07-06 14:40:10 +01:00
Fan Zhang	c7162cd24d	Reorder and clean up imports. ... Test: rebuild Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68	2018-06-18 15:45:09 -07:00
Aurimas Liutikas	e0069d332d	Migrate Settings to androidx. ... Test: make Settings Bug: 76692459 Change-Id: I941dea40562170649bf056e675cc32e5163c0e39	2018-04-20 12:52:29 -07:00
James Lemieux	22a39c2b93	Use external/robolectric-shadows/run_robotests.mk ... This allows Settings to test against the latest framework changes. Also replaced TestConfig with traditional robolectric.properties. Bug: 73173204 Bug: 73892008 Test: make -j56 RunSettingsRoboTests Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7	2018-03-04 03:50:08 -08:00
Fan Zhang	73dc479ab5	Remove security settings v1 code ... Change-Id: I958ed1588009b91f64cd8ecb98208e72a891903e Fixes: 32953042 Test: robotests	2018-01-29 13:17:05 -08:00
Fan Zhang	cf97f0b643	Add tests for some security setting controllers ... Bug: 32953042 Test: robotests Change-Id: Ieab4e6434bbb80313f6d1b25ff1cdea5713038f0	2018-01-05 15:45:53 -08:00