Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Chris Tate
e2cdb20cf8 Merge "Ensure that the stream feeder doesn't hang in write..." into nyc-dev 2016-05-05 19:35:39 +00:00
Alan Viverette
27dfd971b0 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 
am: 3a3fb73c75

* commit '3a3fb73c753efb2114693b1943246bc6c47f9470':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I221eb10696601ed4aff0f0876c07d3d9a24ff4de
 2016-05-05 18:54:38 +00:00
Alan Viverette
3a3fb73c75 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 2016-05-05 18:37:43 +00:00
Jason Monk
b8ae788f07 QS Header: remove collapsed alarm ripple 
Its no longer a button, so it shouldn't act like one.

Change-Id: Iac78f80bb0e99fd4d6135f6c1ceac9bc96c7cc8e
Fixes: 28611090
 2016-05-05 14:36:57 -04:00
shubang
26cf15d866 Merge "TIF: Keep recording sessions while changing user" into nyc-dev 
am: 2bea394d14

* commit '2bea394d14e6e7ae6a183d302d21ce1deacf4774':
  TIF: Keep recording sessions while changing user

Change-Id: I08ebdc9e2ef7c48cc5156ad3238925116f0b4333
 2016-05-05 18:32:06 +00:00
Makoto Onuki
30ead05624 Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev 
am: 8318223a6e

* commit '8318223a6e2a8d5d8b39e0a81ce6fe09150ae100':
  Fix reboot loop when "password to boot" is enabled on ...

Change-Id: I67dd6cdf9c905759c9994ef363b7cffc3d1450f1
 2016-05-05 18:32:03 +00:00
Wang Le
e2c1f9b78b Fix the issue that App crash on startForeground 
Install single APP in any user space except Owner user, the APP
got crash when call startForeground in Service Component with
Notification which without SmallIcon.

External bug:https://code.google.com/p/android/issues/detail?id=209043
Internal bug: 28602381

Change-Id: I88a3b8afc213cafe0f280f9b44d6acd2ea0df207
Signed-off-by: Wang Le <wangle@xiaomi.com>
 2016-05-05 11:31:38 -07:00
Shubang Lu
2bea394d14 Merge "TIF: Keep recording sessions while changing user" into nyc-dev 2016-05-05 18:20:14 +00:00
Chris Thornton
6ca3280f32 Merge "VIMS should only stop the keyphrases it started." into nyc-dev 
am: cac9495030

* commit 'cac94950301557eee97e3a961025ad76c3300dda':
  VIMS should only stop the keyphrases it started.

Change-Id: I717b7a1053665e2fadb1d74e46000981c877d118
 2016-05-05 18:19:39 +00:00
Youngsang Cho
541597c050 Merge "TIF: build TvInput list at onUnlockUser" into nyc-dev 
am: 00f8ee2851

* commit '00f8ee28512aa1fd5afb67a61cb258c01e1bb802':
  TIF: build TvInput list at onUnlockUser

Change-Id: If747026e36d5f67cc2da1745db128ca647692cfa
 2016-05-05 18:19:35 +00:00
TreeHugger Robot
8318223a6e Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev 2016-05-05 18:14:31 +00:00
Jeff Sharkey
e0299560ec Merge "Track current user without calling into AMS." into nyc-dev 
am: 90f4ca78ee

* commit '90f4ca78ee714733dd90427085b496c906e83789':
  Track current user without calling into AMS.

Change-Id: I71566f774f81cef5adbe9cfa0e92343795d9d1ad
 2016-05-05 18:09:39 +00:00
Dirk Dougherty
920bf8a339 Add vanity url for bg optimations. 
Change-Id: I34018b86a5da1abf6cf80427067d5b73eb1b2736
 2016-05-05 11:07:58 -07:00
Chris Thornton
cac9495030 Merge "VIMS should only stop the keyphrases it started." into nyc-dev 2016-05-05 18:06:55 +00:00
Youngsang Cho
00f8ee2851 Merge "TIF: build TvInput list at onUnlockUser" into nyc-dev 2016-05-05 18:06:21 +00:00
Jeff Sharkey
90f4ca78ee Merge "Track current user without calling into AMS." into nyc-dev 2016-05-05 18:01:41 +00:00
Alan Viverette
61c41bf617 Revert "Always assign leftover pixels to last weighted child" 
This reverts commit cc26636f08.

Bug: 27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
 2016-05-05 17:54:36 +00:00
Jeff Sharkey
ab15c391eb Track current user without calling into AMS. 
From a layering point-of-view, StorageManager is below ActivityManager
and it shouldn't be calling upwards, since that risks locking
inversions.  Instead, track the current user through the existing
SystemService callbacks.

Bug: 28598527
Change-Id: I02d3277eb26288d3b4e1897f4c9318a6288c9551
 2016-05-05 11:47:18 -06:00
Fyodor Kupolov
dca21d73ce Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev 
am: 430df0fdb6

* commit '430df0fdb642847f1041756f94bf1483f7597f0c':
  Return from onUserUnlocked if user is no longer unlocked

Change-Id: Iea5f3874a3992bfdf7d1e6b82f65856ed69d03fd
 2016-05-05 17:14:49 +00:00
Jason Monk
a8f07d916d QS Edit: fix some move logic 
Make sure its possible to add tiles when none are there and remove
tiles when all are added.

Bug: 28067638
Change-Id: Ia5a145f095cd33cf8d4a85a0a8aabb2344e3dec6
 2016-05-05 13:11:36 -04:00
Fyodor Kupolov
430df0fdb6 Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev 2016-05-05 17:10:46 +00:00
Richard Uhler
568a969f60 Remove inconsistent 'cmd package compile' documentation. 
Bug: 28562124
Change-Id: I89e6cd0d7ebb717bf1b143b615f717a1f6573549
 2016-05-05 10:07:29 -07:00
Jason Monk
76dd05fc2a Merge "Add action to launch webview implementation settings" into nyc-dev 
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: If44add4529f88a1a5e051262d0c66ca447c12135
 2016-05-05 17:07:09 +00:00
Makoto Onuki
8ac7f2134c Fix reboot loop when "password to boot" is enabled on ... 
a non english locale.

Bug 28607673

Change-Id: I316f348305238616e8254bb878b66099015a3793
 2016-05-05 10:03:09 -07:00
shubang
8049f20df8 TIF: Keep recording sessions while changing user 
Bug: 28302189
Change-Id: I3de400798b9ded5f9f67931fbe7033755d76902f
 2016-05-05 09:58:14 -07:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Cheryl Potter
881401ac3b resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f am: 34b9fa4d47 am: aa99efdb72 
am: d2b11f93d8

* commit 'd2b11f93d826c912fccdd19f7df3444c5cc4bcb5':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: Id129095d7c118112cddfc29cd73d8014d3c0d0c1
 2016-05-05 16:40:19 +00:00
Cheryl Potter
d2b11f93d8 resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f am: 34b9fa4d47 
am: aa99efdb72

* commit 'aa99efdb7290fa3dfdb06ebf756e5e6fb9ae446c':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I1a73b0e45b8940a940b59e1209d908567f59b04b
 2016-05-05 16:37:08 +00:00
Cheryl Potter
aa99efdb72 resolve merge conflicts of c522dc6 to mnc-mr-docs am: 0cb25d527f 
am: 34b9fa4d47

* commit '34b9fa4d471a0bf2b6cf2dc8c342468d48c9fefa':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I24359c6e2eea97383309610f60d83286a0663c7b
 2016-05-05 16:34:12 +00:00
Vladislav Kaznacheev
acf147e7e3 Add @TestApi to ActivityOptions.setLaunchStackId 
Bug: 28506739
Change-Id: I20fe4d080c125b38a84d9832a497340f805e82e7
 2016-05-05 09:32:27 -07:00
Selim Cinek
cfcd23e61b Fixed a bug where Notifications could overlap 
Change-Id: Ic7f9599cee95411e1207b609e584038ad8cb4d99
Fixes: 28550654
 2016-05-05 12:31:42 -04:00
Cheryl Potter
34b9fa4d47 resolve merge conflicts of c522dc6 to mnc-mr-docs 
am: 0cb25d527f

* commit '0cb25d527f4ca81910feb106cca7ca156a34018b':
  docs: Update help button redirects for new Android Monitor docs b/28592116

Change-Id: I24ec45420bab5a346f4d86b7a1a09ed9a3dec67f
 2016-05-05 16:31:08 +00:00
Youngsang Cho
19c47d7995 TIF: build TvInput list at onUnlockUser 
From N, apps cannot be accesible until onUnlockUser is called.
So the TvInput's list needs to be built at onUnlockUser.

Bug: 28586844
Change-Id: I84c896fa243c05c7e1f794863d8a83288549e6ff
 2016-05-05 09:21:24 -07:00
Adam Powell
8a2c41426a Merge "Have the Resolver/Chooser activities handle resize config changes" into nyc-dev 
am: a75d4877af

* commit 'a75d4877af7fa045cc91b2d60d3801aa098608de':
  Have the Resolver/Chooser activities handle resize config changes

Change-Id: I428ddcedf28316cbaf8a6fa4f77ad5ee86949559
 2016-05-05 16:10:19 +00:00
Adam Powell
a75d4877af Merge "Have the Resolver/Chooser activities handle resize config changes" into nyc-dev 2016-05-05 16:04:07 +00:00
Rubin Xu
c2be342b10 Merge "Remove obsolete file" into nyc-dev 
am: f91d66e8c0

* commit 'f91d66e8c09119dcc06a5b48fe7785a8e255f15b':
  Remove obsolete file

Change-Id: I3ffc97d36895cccbae0a37e802c707d5869b7393
 2016-05-05 15:59:01 +00:00
Rubin Xu
f91d66e8c0 Merge "Remove obsolete file" into nyc-dev 2016-05-05 15:54:17 +00:00
Jason Monk
705e67b3f8 Merge "Fix QS crash with RTL rotate" into nyc-dev 
am: 4a19a2043c

* commit '4a19a2043c0b1d698154fbd66309b95e3b6f10f2':
  Fix QS crash with RTL rotate

Change-Id: I53b42f85cc1dd435fa1582c3435c5e6cf6ce1938
 2016-05-05 15:50:57 +00:00
Jason Monk
ce8c21683d Merge "Fix QS edit accessibility" into nyc-dev 
am: c665a3d4e9

* commit 'c665a3d4e9000623fb01694383b73a0eef8b5c4a':
  Fix QS edit accessibility

Change-Id: I12ac600f198c8ed44b3a66741a6959b27c061571
 2016-05-05 15:45:39 +00:00
Jason Monk
a9922092e6 Merge "QS Edit: announce exit/entrance" into nyc-dev 
am: d27ed8b336

* commit 'd27ed8b3363a4ff24ada13fd093caecfc815d99c':
  QS Edit: announce exit/entrance

Change-Id: Id78980817d0ce06c6bd140afd74b525d8f46dcd1
 2016-05-05 15:45:37 +00:00
Jason Monk
faaee94e0f Merge "Fix QS header settings + user visibilities" into nyc-dev 
am: 3f50a94e6c

* commit '3f50a94e6c5afff6814b88f59b59475616836e6c':
  Fix QS header settings + user visibilities

Change-Id: I3872dc0d928417a65ec011abb22860839bf0a17f
 2016-05-05 15:45:34 +00:00
Rubin Xu
9af20ffb59 Remove obsolete file 
Bug: 27531824
Change-Id: Id6706f0ba6a68723704e58a7fbd8b529e3ec7970
 2016-05-05 16:43:26 +01:00
Jason Monk
4a19a2043c Merge "Fix QS crash with RTL rotate" into nyc-dev 2016-05-05 15:42:43 +00:00
Jason Monk
c665a3d4e9 Merge "Fix QS edit accessibility" into nyc-dev 2016-05-05 15:41:34 +00:00
Jason Monk
d27ed8b336 Merge "QS Edit: announce exit/entrance" into nyc-dev 2016-05-05 15:41:07 +00:00
Jason Monk
3f50a94e6c Merge "Fix QS header settings + user visibilities" into nyc-dev 2016-05-05 15:40:34 +00:00
Jason Monk
f3bd7a300f Fix QS header settings + user visibilities 
Change-Id: If2b5fb2ab47254bb0e44685a0fcd5d92d5d347fb
Fixes: 28235542
 2016-05-05 10:15:25 -04:00
Adrian Roos
27c6fb03d8 Merge "Fix Trust Agent discovery for FBE" into nyc-dev 
am: 957df516f0

* commit '957df516f006129198847ff9448004c097e1be98':
  Fix Trust Agent discovery for FBE

Change-Id: I6afecf1568563550a95a73611576035c5f9a09c8
 2016-05-05 14:12:33 +00:00
Adrian Roos
957df516f0 Merge "Fix Trust Agent discovery for FBE" into nyc-dev 2016-05-05 14:05:10 +00:00