Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricky Wai
276f168f10 Hide work profile key in user credentials screen 
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I7609dc8bc68e9c9eb2a969b58b31815d27d7fc4a
 2016-05-25 13:18:26 +00:00
Ricky Wai
454bb8d526 Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4 
am: 88986c8887

* commit '88986c8887a2107480d896359569a8e188bbf083':

Change-Id: I99494f984c753e574ae56d16d84841aa54838098
 2016-05-25 13:18:13 +00:00
Ricky Wai
2281b83051 Do not allow DPM.resetPassword() when child profile exists or user is locked 
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: If87e0c523af3fdbd5d0f0182037fba0758cb4cfb
 2016-05-25 13:15:33 +00:00
Ricky Wai
efc3838caa Merge "Unlock work profile storage even work mode is off" into nyc-dev 
am: f420c413b9

* commit 'f420c413b9abd58dcbea881535da5b603f7f7afc':
  Unlock work profile storage even work mode is off

Change-Id: Id0d15aca6b8f8d519910c38e03bf4c82894b8e37
 2016-05-25 13:15:26 +00:00
Ricky Wai
e629990e34 Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4 
am: 8d5ab52c6c

* commit '8d5ab52c6c9a5987bc1cd1fcc000a458ba619acb':
  Do not tie managed profile synchronously in onUnlockUser()

Change-Id: I5e2bb7364c957b41deb9389d0ee75efe68a8bc0b
 2016-05-25 13:15:20 +00:00
Ricky Wai
fdf928d4b5 Do not allow DPM.resetPassword() when child profile exists or user is locked 
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: I05277051a8f30c4d020440dd01b5dc284d552fd4
 2016-05-25 13:14:23 +00:00
Ricky Wai
f518aaaf1f Merge "Unlock work profile storage even work mode is off" into nyc-dev 
am: f420c413b9

* commit 'f420c413b9abd58dcbea881535da5b603f7f7afc':
  Unlock work profile storage even work mode is off

Change-Id: I7ecd5f3658a9507b0bee4dea390a88ff7ef9a82e
 2016-05-25 13:14:21 +00:00
Ricky Wai
88986c8887 Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev 
am: 99df649aa4

* commit '99df649aa4907d9f9c6fe4bdf4acb517003f97f2':
  Do not tie managed profile synchronously in onUnlockUser()

Change-Id: I2d67bf4dc5f7421fef104db4ad25f5bb8bfa4e7d
 2016-05-25 13:12:07 +00:00
Ricky Wai
8d5ab52c6c Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev 
am: 99df649aa4

* commit '99df649aa4907d9f9c6fe4bdf4acb517003f97f2':
  Do not tie managed profile synchronously in onUnlockUser()

Change-Id: Iea5c0c6bccbce1a7b81fec9f38589ffd31475a24
 2016-05-25 13:11:25 +00:00
Ricky Wai
d398244513 Hide work profile key in user credentials screen 
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
 2016-05-25 13:11:09 +00:00
Ricky Wai
977ade26dd Do not allow DPM.resetPassword() when child profile exists or user is locked 
Bug: 28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
 2016-05-25 13:09:44 +00:00
Ricky Wai
f420c413b9 Merge "Unlock work profile storage even work mode is off" into nyc-dev 2016-05-25 13:06:24 +00:00
Ricky Wai
99df649aa4 Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev 2016-05-25 13:04:32 +00:00
Ricky Wai
4613fe41ac Add resetKeyStore() in LockSettingsService 
Before resetKeyStore(), it will back up child profile keys,
and will be restored after primary profile keystore is cleared.

Bug: 28878708
Change-Id: I0cb4a1f885d468894bc7eb95af694328bf92ce16
 2016-05-25 11:39:56 +01:00
Android Build Merger (Role)
63cb0fbf07 Merge "Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1 am: e8ae33f6e6" into nyc-mr1-dev-plus-aosp 2016-05-25 05:02:38 +00:00
Yohei Yukawa
ed451eb6ee Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1 
am: e8ae33f6e6

* commit 'e8ae33f6e68107f963c4ea2497ffedf468be5b02':
  Make IMM more robust to spurious window focus-in

Change-Id: I27d765a313d441164f35d423108263e820d74c04
 2016-05-25 05:02:13 +00:00
Yohei Yukawa
e5befc5221 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1 
am: ef68474698

* commit 'ef684746980061bb5950ae2505229648d9f146d6':
  Make IMM more robust to spurious window focus-in

Change-Id: I77ae5953aa9afc64ef1cd3252d6d2ff936890b62
 2016-05-25 05:02:09 +00:00
Yohei Yukawa
ef68474698 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 
am: 50c33d1ca1

* commit '50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
  Make IMM more robust to spurious window focus-in

Change-Id: I1d9a138798d982f2164907b49713a7b90cec9adc
 2016-05-25 04:58:20 +00:00
Yohei Yukawa
e8ae33f6e6 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 
am: 50c33d1ca1

* commit '50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
  Make IMM more robust to spurious window focus-in

Change-Id: I3c80320a5c6711bf3aaeb3043fe54c741c127966
 2016-05-25 04:57:43 +00:00
Yohei Yukawa
50c33d1ca1 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 2016-05-25 04:47:31 +00:00
Android Build Merger (Role)
9112271883 Merge "Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe am: 9995396b26" into nyc-mr1-dev-plus-aosp 2016-05-25 03:38:28 +00:00
Android Build Merger (Role)
d580dc0445 Merge "Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6 am: 6a63f7b496" into nyc-mr1-dev-plus-aosp 2016-05-25 03:38:16 +00:00
Seigo Nonaka
de6cf62a6a Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe 
am: 9995396b26

* commit '9995396b26fc2e12f9eac6b1e7c7de0a94f2362d':
  Use original theme for SuggestsionsPopupWindow

Change-Id: I86d591cb947db28d6896f818096d3c52f9819d90
 2016-05-25 03:37:26 +00:00
Seigo Nonaka
48cb2ee07b Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe 
am: 7b77768d39

* commit '7b77768d39fdc1de95bbf32a809b52eb26c9e10d':
  Use original theme for SuggestsionsPopupWindow

Change-Id: Iadf842b82cb178bcaf69c7790051ae3f17b5bd34
 2016-05-25 03:37:22 +00:00
Hugo Benichi
ee15388c6f Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6 
am: 6a63f7b496

* commit '6a63f7b49651adb2a45c1c089e0ac06cc1f4158e':
  Fix default network transition event recording

Change-Id: I94e4ff336a8102f4bc0e19acb705ba4838a1f17a
 2016-05-25 03:37:22 +00:00
Hugo Benichi
06facea297 Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6 
am: bfbf55fcbd

* commit 'bfbf55fcbd5cbd347642023ab46b22d114f22592':
  Fix default network transition event recording

Change-Id: Ife822c39d617f89dde4cda5f2137b80425fe89ad
 2016-05-25 03:37:19 +00:00
Seigo Nonaka
7b77768d39 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 
am: 7c8305bcfe

* commit '7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
  Use original theme for SuggestsionsPopupWindow

Change-Id: Ib724b88ace6e27a499578c473acfd2a909f62068
 2016-05-25 03:31:38 +00:00
Hugo Benichi
bfbf55fcbd Merge "Fix default network transition event recording" into nyc-dev 
am: 9d4e66ece6

* commit '9d4e66ece64f6b65d8a902a6f03f945a0fe88868':
  Fix default network transition event recording

Change-Id: Ic6ae9cd2620b1793f53667eb7d84c0b6f56d716e
 2016-05-25 03:31:34 +00:00
Seigo Nonaka
9995396b26 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 
am: 7c8305bcfe

* commit '7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
  Use original theme for SuggestsionsPopupWindow

Change-Id: I77ed2205c4dc34786c1b931a00f64187a878395e
 2016-05-25 03:30:06 +00:00
Hugo Benichi
6a63f7b496 Merge "Fix default network transition event recording" into nyc-dev 
am: 9d4e66ece6

* commit '9d4e66ece64f6b65d8a902a6f03f945a0fe88868':
  Fix default network transition event recording

Change-Id: Ie025342be8e13bfd1d3f4b45d522cc30b56ef606
 2016-05-25 03:29:59 +00:00
Seigo Nonaka
7c8305bcfe Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 2016-05-25 03:24:11 +00:00
Hugo Benichi
9d4e66ece6 Merge "Fix default network transition event recording" into nyc-dev 2016-05-25 03:22:32 +00:00
Android Build Merger (Role)
332a2b1750 Merge "Merge "Created 4 camera preview stress test cases." into nyc-dev am: 581387a4ae am: 703d3fd84d" into nyc-mr1-dev-plus-aosp 2016-05-25 03:22:28 +00:00
Hang Yin
a340a1ab90 Merge "Created 4 camera preview stress test cases." into nyc-dev am: 581387a4ae 
am: 703d3fd84d

* commit '703d3fd84dc1d0ed7053431c80434a916ef8df39':
  Created 4 camera preview stress test cases.

Change-Id: I1c418ab6f685d4e81078cee5965c7f693d0f5718
 2016-05-25 03:21:57 +00:00
Suprabh Shukla
4db768cd63 Merge "Updating user restrictions when they are removed" into nyc-dev am: 1893c4cea7 
am: a20e7d86ba

* commit 'a20e7d86ba94280422574596a6647f31e5bd2c53':
  Created 4 camera preview stress test cases.

Change-Id: Ifc9c7896c5131b524f9073d7316f95c0dc6106f2
 2016-05-25 03:20:53 +00:00
Android Build Merger (Role)
5dd11aca4a Merge "Merge "Updating user restrictions when they are removed" into nyc-dev am: 1893c4cea7 am: a0afc2111b" into nyc-mr1-dev-plus-aosp 2016-05-25 03:18:38 +00:00
Suprabh Shukla
62d8403803 Merge "Updating user restrictions when they are removed" into nyc-dev am: 1893c4cea7 
am: a0afc2111b

* commit 'a0afc2111b30beb87fa5c73050a5ea7e56fdce1a':
  Updating user restrictions when they are removed

Change-Id: I75abe2a7aff6af02894b66f8fae255485f60570d
 2016-05-25 03:18:09 +00:00
Hang Yin
a20e7d86ba Merge "Created 4 camera preview stress test cases." into nyc-dev 
am: 581387a4ae

* commit '581387a4aebd88debe065dd2957ad59d0bb000b5':
  Created 4 camera preview stress test cases.

Change-Id: I992538ee1e1df22fdca5798df7ccaae899e239ec
 2016-05-25 03:18:07 +00:00
Suprabh Shukla
1bd23b3bf1 Merge "Updating user restrictions when they are removed" into nyc-dev am: 1893c4cea7 
am: 057a81d0b3

* commit '057a81d0b302ba5c76690ae22bdc2f5a5f437700':
  Updating user restrictions when they are removed

Change-Id: I7d97675cdcda56ee14c43c2fa1755a29e4c6361a
 2016-05-25 03:18:06 +00:00
Hang Yin
703d3fd84d Merge "Created 4 camera preview stress test cases." into nyc-dev 
am: 581387a4ae

* commit '581387a4aebd88debe065dd2957ad59d0bb000b5':
  Created 4 camera preview stress test cases.

Change-Id: I3dc460887c688d666ad7d129fbad897666798042
 2016-05-25 03:18:05 +00:00
Suprabh Shukla
057a81d0b3 Merge "Updating user restrictions when they are removed" into nyc-dev 
am: 1893c4cea7

* commit '1893c4cea7825e9f44f08b6165a04fd90c1adf9d':
  Updating user restrictions when they are removed

Change-Id: I07b1d9878dc8517c964277f4507203dcd44ceeee
 2016-05-25 03:14:39 +00:00
Suprabh Shukla
a0afc2111b Merge "Updating user restrictions when they are removed" into nyc-dev 
am: 1893c4cea7

* commit '1893c4cea7825e9f44f08b6165a04fd90c1adf9d':
  Updating user restrictions when they are removed

Change-Id: Iccd07150139f025fa16b74eee2670252b6c17a3d
 2016-05-25 03:14:36 +00:00
Hang Yin
581387a4ae Merge "Created 4 camera preview stress test cases." into nyc-dev 2016-05-25 03:14:02 +00:00
TreeHugger Robot
1893c4cea7 Merge "Updating user restrictions when they are removed" into nyc-dev 2016-05-25 03:11:49 +00:00
Android Build Merger (Role)
87410b2106 Merge "Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 am: 30f481368c" into nyc-mr1-dev-plus-aosp 2016-05-25 02:17:34 +00:00
Keisuke Kuroyanagi
e6dfb552cd Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 
am: 30f481368c

* commit '30f481368c385420c23db9b3835bc28bf7380dca':
  Set input method mode for CascadingMenuPopup.

Change-Id: Ie68087ab8fa8281f4053cf0560402df37ec524b1
 2016-05-25 02:17:04 +00:00
Keisuke Kuroyanagi
c2a363fd24 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 
am: 66e5b59d85

* commit '66e5b59d852e7a746945b0a729cda287bd922187':
  Set input method mode for CascadingMenuPopup.

Change-Id: Ie9efc3abeec02062baccb68615b1ccee5526abd8
 2016-05-25 02:17:01 +00:00
Keisuke Kuroyanagi
30f481368c Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I117ea7e9b00fdd8eb26fd761a23925909318a12e
 2016-05-25 02:11:26 +00:00
Keisuke Kuroyanagi
66e5b59d85 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I22fcbfb60161aaa660abc43bc9f739829f8e53a5
 2016-05-25 02:11:22 +00:00
Keisuke Kuroyanagi
edebcae978 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 2016-05-25 02:06:25 +00:00