Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
262,283 Commits 3 Branches 0 Tags
2970216a2bb73c06de5a97b36cc13365f6c55764
Commit Graph

60603 Commits

Author SHA1 Message Date
Paul Crowley
2970216a2b Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb am: 2a1076339e 
am: 02826bb36b

* commit '02826bb36b023ba80b88ada743ac32b534a2c380':
  Two phases to set the password for disk encryption

Change-Id: Ib4dcc51963c1edc8410031a5dcb7c4eb0d876e16
 2016-05-18 22:59:54 +00:00
Paul Crowley
02826bb36b Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb 
am: 2a1076339e

* commit '2a1076339ecb7ba9b7c8829bb3c3285df29a67e3':
  Two phases to set the password for disk encryption

Change-Id: I884dae66b133d8b9312a7793d415964e13ed8105
 2016-05-18 22:54:43 +00:00
Paul Crowley
2a1076339e Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: I76b3b1351ea85d8a5e42da523f57a291b3a1b0d9
 2016-05-18 22:50:02 +00:00
Paul Crowley
56a9395aeb Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-18 22:40:09 +00:00
TreeHugger Robot
68c92c7ca6 Merge "Added a getPrimaryStorageSize() method." 2016-05-18 22:35:26 +00:00
Robert Carr
2fd8c219b2 Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: 9782de1ffd 
am: 3b0a049b11

* commit '3b0a049b1175189c6a6b2f2d0dca05f925ec3b67':
  Fixes for ending PiP animation.

Change-Id: I0cd5217e724182d979c08cc367c24d63dec3a7cc
 2016-05-18 22:16:00 +00:00
Robert Carr
3b0a049b11 Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb 
am: 9782de1ffd

* commit '9782de1ffd344d1a8250b8ead4a13eee16c20cde':
  Fixes for ending PiP animation.

Change-Id: I34acea654389eedd7d3b6f6e7ec2f239cccf2ae6
 2016-05-18 22:11:10 +00:00
Robert Carr
9782de1ffd Merge "Fixes for ending PiP animation." into nyc-dev 
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: If885965536859bc2433d14d4993010871c171360
 2016-05-18 22:05:30 +00:00
Winson
81100ae084 Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 6e2ee9e382 
am: ea9220988e

* commit 'ea9220988e8c88d258a5cb99e2687ee03f90cf55':
  Mark occluded home stack as invisible.

Change-Id: I8f9f1a92e198f7db97d7c3e1b93ff77a83fdbc5c
 2016-05-18 22:01:00 +00:00
TreeHugger Robot
bc9edc7ccb Merge "Fixes for ending PiP animation." into nyc-dev 2016-05-18 21:57:23 +00:00
Winson Chung
ea9220988e Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 
am: 6e2ee9e382

* commit '6e2ee9e382dd86340d5242fe04a623b9cda10f6e':
  Mark occluded home stack as invisible.

Change-Id: I1762cf46b675fe2c5151332a53139e95d676cb01
 2016-05-18 21:56:10 +00:00
Winson
6e2ee9e382 Merge "Mark occluded home stack as invisible." into nyc-dev 
am: 32b54f2e42

* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
  Mark occluded home stack as invisible.

Change-Id: Iaa68bb7c93ffd8bcfc9af3e66fd7fced7787a671
 2016-05-18 21:49:17 +00:00
Winson Chung
32b54f2e42 Merge "Mark occluded home stack as invisible." into nyc-dev 2016-05-18 21:42:57 +00:00
Amith Yamasani
a3d46611e3 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev am: dbf0dbd8c2 
am: 1ab19ea6e6

* commit '1ab19ea6e6575a578244eecbae61d46150bec392':
  Retail mode flag and some clients for it

Change-Id: I08eb3539db3fd29403d05d8ef1124862a78d1acc
 2016-05-18 21:07:37 +00:00
Amith Yamasani
1ab19ea6e6 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 
am: dbf0dbd8c2

* commit 'dbf0dbd8c216e801b3d95f83d13ae05c1ba0ea39':
  Retail mode flag and some clients for it

Change-Id: I5f9e7c49759154925c6f20ab3fd647d84259b1bb
 2016-05-18 21:01:49 +00:00
Amith Yamasani
dbf0dbd8c2 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 2016-05-18 20:57:12 +00:00
Svet Ganov
f092af3f90 Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70 am: 1129a0f473 
am: 891fcc2779

* commit '891fcc277944ae32c6dda9954e36f52363f8df76':
  Hide ephemeral API

Change-Id: I5526e933019bbb9c821a35bc19c3c10cf15b9c3d
 2016-05-18 20:26:04 +00:00
Robert Carr
c7294607fc Fixes for ending PiP animation. 
During the PiP animation, we have two basic requirements:
   1. We need to scale windows to the pinned stack bounds.
   2. We need to halt resize and movement notifications to the client.
As we end the animation, we need to disable these states at differing
times. First we need to deliver a final resize and movement notification
to the client for it's new position. However, Surfaces may not
immediately resize (in particular in the case of child windows,
it may be some time!), furthermore Surfaces may resize at different
times so we need to persist scaling on a Surface by Surface
basis after reenabling resize notifications.

Bug: 28559097
Change-Id: I6d52a3e213e08a34f4c0eea892b2a84cd4c20e18
 2016-05-18 13:24:41 -07:00
Svetoslav Ganov
891fcc2779 Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70 
am: 1129a0f473

* commit '1129a0f4733514043b3f9240dbe77124260d9d53':
  Hide ephemeral API

Change-Id: I79a26bd67329872b8282d9c0d207ab949d815307
 2016-05-18 20:21:07 +00:00
Svet Ganov
1129a0f473 Merge "Hide ephemeral API" into nyc-dev 
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I1de27c7aac1ba488c755d615f039a069928ba7be
 2016-05-18 20:16:38 +00:00
Svet Ganov
75a364eabf Merge "Hide ephemeral API" into nyc-dev 
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I033dcf9e551cf3a110aea0b3493e3cdad9a38d80
 2016-05-18 20:16:33 +00:00
Svetoslav Ganov
68c2919f70 Merge "Hide ephemeral API" into nyc-dev 2016-05-18 20:10:28 +00:00
Robert Sesek
9576535c80 Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." 2016-05-18 20:08:44 +00:00
Sudheer Shanka
773cbc0da1 Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: db9d529499 
am: d412dfc2a8

* commit 'd412dfc2a80166038e8ea17759dfdfc1b03b419d':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I021b42322aed96471559574aa7d6af63ced784b4
 2016-05-18 17:23:31 +00:00
Tony Mak
d412dfc2a8 Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 
am: db9d529499

* commit 'db9d529499cc635c5ce3d0a4d5b44f2211afaef6':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I12805ef5c1a7039ccad07e31f84231cc703dd470
 2016-05-18 17:18:36 +00:00
Sudheer Shanka
db9d529499 Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 
am: 0d902adbbc

* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
 2016-05-18 17:14:29 +00:00
Sudheer Shanka
6c505ecdd6 Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 
am: 0d902adbbc

* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I2a0a71595b2af94d9806386877ca510c0cee3271
 2016-05-18 17:14:25 +00:00
TreeHugger Robot
0d902adbbc Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 2016-05-18 17:09:46 +00:00
Robert Sesek
a506d23ca8 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6 am: ffc715b8f5 
am: 4b7f83870b

* commit '4b7f83870be5a0fae07ff7a254b25cf258a24f39':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I3562273285d115aa5b9822a3586b2730c59a1203
 2016-05-18 15:43:14 +00:00
Robert Sesek
4b7f83870b Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6 
am: ffc715b8f5

* commit 'ffc715b8f5ad7a4cbdb8805f0fd916501ac3ba64':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I1b5570d889c20f8a029a5321a290b6807ce6af77
 2016-05-18 15:39:05 +00:00
Robert Sesek
ffc715b8f5 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I5306ff5f4e9abe6161616873e752cf4d54ed6408
 2016-05-18 15:32:54 +00:00
Robert Sesek
a83b4cfc74 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: Ie16d11c4aaa515a570b8b717241d556903198d24
 2016-05-18 15:32:18 +00:00
Robert Sesek
f45bc095c6 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 2016-05-18 15:25:41 +00:00
Svet Ganov
2265fddba6 Hide ephemeral API 
bug:28825660

Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
 2016-05-18 07:38:29 -07:00
Jim Miller
e3a46d8e81 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev am: 0991ba5b01 
am: a6ae8004c5

* commit 'a6ae8004c501f998818dc4af727b81dcc20de3f9':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: Ie28b7098c298daeabd35af3c0bfb6b88976ddc7a
 2016-05-18 03:35:41 +00:00
Jim Miller
a6ae8004c5 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 
am: 0991ba5b01

* commit '0991ba5b01da4560116bebaa92e30fc97e7f2879':
  Add fingerprint navigation to enable pulling down the statusbar

Change-Id: I52de480ef1a1efc335b215fdf21d9d29c05aa951
 2016-05-18 03:19:58 +00:00
Jim Miller
0991ba5b01 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 2016-05-18 02:55:10 +00:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681 
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
 2016-05-18 02:25:10 +00:00
Yohei Yukawa
bf4c8f730b Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 
am: ddaf3f4681

* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
  Move LocaleList to avoid layering violation.

Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
 2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev 
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
 2016-05-18 02:18:38 +00:00
Yohei Yukawa
13fa6b7c48 Merge "Move LocaleList to avoid layering violation." into nyc-dev 
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
 2016-05-18 02:18:29 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Jim Miller
f4c0a13170 Add fingerprint navigation to enable pulling down the statusbar 
Change-Id: If0584358fd615ebd9df11614c662f4f287abf5c4
 2016-05-17 18:11:52 -07:00
Chris Craik
661e4cb059 Merge "Document that SurfaceView is synchronous in N" into nyc-dev am: 0cfbb7643e am: 77f706980e 
am: 44f88692b7

* commit '44f88692b7054be6eb3dfeed5bf428c8c36ece5f':
  Document that SurfaceView is synchronous in N

Change-Id: I62d5f1eed6441b99edb5054e8d6ee3858663bc38
 2016-05-18 01:05:01 +00:00
Chris Craik
44f88692b7 Merge "Document that SurfaceView is synchronous in N" into nyc-dev am: 0cfbb7643e 
am: 77f706980e

* commit '77f706980ed2dff9bfb916382be26204b589b96e':
  Document that SurfaceView is synchronous in N

Change-Id: I357c8be635a5e78f42997bfc4c96509729504c35
 2016-05-18 01:00:53 +00:00
Andrii Kulian
5417ca597a Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac 
am: 06a325c3e3

* commit '06a325c3e3b1925c2208892f13570f08e180b12c':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I6eb614317b520e5a902dbc7533f3f08b68ed4861
 2016-05-18 01:00:50 +00:00
Joe Onorato
160d5c57cf Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 am: 6b10cec210 
am: 269f64079b

* commit '269f64079b34eb178a33dba306d610c8dfb322c4':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: I9d6419d9c587eaca1577cef82a1ec054a6bb3d6c
 2016-05-18 00:55:42 +00:00
Hangyu Kuang
47389bce2c Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573 am: 993f685045 
am: c936ef8af2

* commit 'c936ef8af23ae78e0f50a71c566f4d0fa1b56ea8':
  Hide HdrCapabilities constructor.

Change-Id: I168da49d4044cca71ae423813044682c17e692f7
 2016-05-18 00:55:35 +00:00
Chris Craik
77f706980e Merge "Document that SurfaceView is synchronous in N" into nyc-dev 
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I508585ec749b0a5d4e241757d655349b09b31566
 2016-05-18 00:55:17 +00:00
Chris Craik
1edc049919 Merge "Document that SurfaceView is synchronous in N" into nyc-dev 
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I1e4a36d64be663103c3150c86a75e2baa51fa4c4
 2016-05-18 00:55:16 +00:00