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
Android Build Merger (Role)
45fab75ab6 Merge "Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 am: b2e2d2686d" into nyc-mr1-dev-plus-aosp 2016-05-17 18:59:43 +00:00
Android Build Merger (Role)
4ee5e1b69b Merge "Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9 am: 59ce20df8c am: 482bf05a8f am: 149e49c5bd" into nyc-mr1-dev-plus-aosp 2016-05-17 18:59:30 +00:00
Jae Seo
b3de93c809 Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 
am: b2e2d2686d

* commit 'b2e2d2686d4a33218486a026f3ad546f3f25490d':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: I1b2dddec6a415e43d6f85682c713ae12029740c5
 2016-05-17 18:58:58 +00:00
Jae Seo
d0006f584f Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 
am: 3488ed71d2

* commit '3488ed71d26b62ec7f4f5f6e8a02a19ba4440ab6':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Iac43c8b1fb1484ea0b66080f941d247b116dcff5
 2016-05-17 18:58:53 +00:00
Kevin Hufnagle
77b36ccd0a Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9 am: 59ce20df8c am: 482bf05a8f 
am: 149e49c5bd

* commit '149e49c5bdb91747e07a585a995fe4118ccf5108':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: I445e37d3988a703cd8244ac94dc7ad0594aa17bc
 2016-05-17 18:58:53 +00:00
Kevin Hufnagle
b9aef689e1 Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9 am: 59ce20df8c am: 482bf05a8f 
am: 3a31e0a294

* commit '3a31e0a294fb5b418333ab98f6a6795076051b17':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: I030c4cfba06ce3c4ddd618766987e70219032354
 2016-05-17 18:58:49 +00:00
Jae Seo
b2e2d2686d Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev 
am: 7996b96311

* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: I99540dd3060f1fe8467ac8207976e420c8b7635f
 2016-05-17 18:55:39 +00:00
Android Build Merger (Role)
1c06a8bb40 Merge "docs: Wear preview - update to leftnav am: ca23070a46 am: 26599cc0e2 am: 58af97860b am: 257f6e8516" into nyc-mr1-dev-plus-aosp 2016-05-17 18:51:57 +00:00
Android Build Merger (Role)
333c247356 Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 am: f45186e311" into nyc-mr1-dev-plus-aosp 2016-05-17 18:51:45 +00:00
Bert McMeen
48bca204c8 docs: Wear preview - update to leftnav am: ca23070a46 am: 26599cc0e2 am: 58af97860b 
am: 257f6e8516

* commit '257f6e85169eea9d12533e1abf2143908904b033':
  docs: Wear preview - update to leftnav

Change-Id: I27911525dbdfa6aa65b356cb61e29e535ec875e5
 2016-05-17 18:51:06 +00:00
Jae Seo
3488ed71d2 Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev 
am: 7996b96311

* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Ic7a930eb85984bab3e4a83ffa02ad30c30a568cf
 2016-05-17 18:51:02 +00:00
Kevin Hufnagle
3a31e0a294 Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9 am: 59ce20df8c 
am: 482bf05a8f

* commit '482bf05a8f192b1978362108c23bc24f6dfe529e':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: I98bfa66b0cdfe7c2447c2a675cfd81c3ac750f3e
 2016-05-17 18:50:56 +00:00
Felipe Leme
4f58f48572 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 
am: f45186e311

* commit 'f45186e311a72780284ba00e6a266b487c3599da':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I64af44f5b12248facbeeef66d0ff5372ec5e69ed
 2016-05-17 18:50:22 +00:00
Bert McMeen
284bb99059 docs: Wear preview - update to leftnav am: ca23070a46 am: 26599cc0e2 am: 58af97860b 
am: 4be34de36a

* commit '4be34de36a9b82123823cba734d452a9627c22df':
  docs: Wear preview - update to leftnav

Change-Id: I11a6e8f72ab18319e769b8609cedabe2d51e0349
 2016-05-17 18:47:52 +00:00
Felipe Leme
8b297e554d Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 
am: 3b91df7ccf

* commit '3b91df7ccf7ee4adf9914ffcdcbf220eb9f9fd08':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Idb223f33d6c5b1d4054bd41f4b9b9672c507986c
 2016-05-17 18:47:41 +00:00
Martijn Coenen
3a5379285d Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc 
am: 225d221945

* commit '225d221945fb3a36011be80f0e8201a27c429862':

Change-Id: I6770a739ff76e6eab0cf24d66f9099e4ff900191
 2016-05-17 18:47:33 +00:00
Dianne Hackborn
0439cf9c11 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev am: 8f359afdc3 
am: f2ddee2636

* commit 'f2ddee263662fd5d5854c86a49d53407a43ccffc':

Change-Id: Ieb1d7c1cb2143ef090c1765e04f492d4ce8d2075
 2016-05-17 18:47:26 +00:00
Kevin Hufnagle
149e49c5bd Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9 am: 59ce20df8c 
am: 482bf05a8f

* commit '482bf05a8f192b1978362108c23bc24f6dfe529e':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: I20dcc5b7db02fd4d708bc8dfd3267ffa37577e88
 2016-05-17 18:47:19 +00:00
Dianne Hackborn
6189716d08 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 
am: 4d7e92b56b

* commit '4d7e92b56bcf02e96e474ce44ff6f019d4fa5a08':

Change-Id: Ic0e370508156103fa32342720c5a74e68e2f95fc
 2016-05-17 18:47:18 +00:00
Jorim Jaggi
261f4c6533 Fix janky multi-window entry animation am: c5887ea7a0 
am: c3701426c0

* commit 'c3701426c03b65be3ce6e7f250758eafe0268c56':

Change-Id: Ie8a74cfea4ead978da88aab787fa28c737a680a5
 2016-05-17 18:47:08 +00:00
TreeHugger Robot
7996b96311 Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev 2016-05-17 18:45:44 +00:00
Bert McMeen
257f6e8516 docs: Wear preview - update to leftnav am: ca23070a46 am: 26599cc0e2 
am: 58af97860b

* commit '58af97860bd267369fc8a9dcdc212bcfab69ecae':
  docs: Wear preview - update to leftnav

Change-Id: I804349093b1988cb242a74526651e003120dca87
 2016-05-17 18:44:58 +00:00
Felipe Leme
f45186e311 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: I4e19dd2828b8b67fc7b2d2173d77a82d67d53d19
 2016-05-17 18:43:43 +00:00
Martijn Coenen
5832df526f Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc 
am: 68b426a30d

* commit '68b426a30d964295360f32defc2b66e6b7247a93':
  Adddress NFC API review comments.

Change-Id: I00acef221305c4cb7aea75c842c1a758cccfb953
 2016-05-17 18:39:50 +00:00
Dianne Hackborn
ef285135af Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev am: 8f359afdc3 
am: 16f6215ef5

* commit '16f6215ef5623e66fc9c8f401e6706831de0250c':
  Fix issue #28641630: Service client dumps are timing out for no reason

Change-Id: I27fea32d69f9d26644dd4fb9106012c450208872
 2016-05-17 18:39:47 +00:00
Dianne Hackborn
ae5664af28 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 
am: a24af982ff

* commit 'a24af982fffeeb6d3d4919907b5c27064c5a8ff1':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
 2016-05-17 18:39:42 +00:00
Bert McMeen
4be34de36a docs: Wear preview - update to leftnav am: ca23070a46 am: 26599cc0e2 
am: 58af97860b

* commit '58af97860bd267369fc8a9dcdc212bcfab69ecae':
  docs: Wear preview - update to leftnav

Change-Id: I0ede33966fb830cd4a45257ffb677cd2caeb0456
 2016-05-17 18:39:37 +00:00
Jorim Jaggi
a7b4fb4883 Fix janky multi-window entry animation am: c5887ea7a0 
am: 791b7979e9

* commit '791b7979e9a4bfca7e6e8e6c1cfedda47738ac1c':
  Fix janky multi-window entry animation

Change-Id: I2a6ec9fc49bbba9b4a09d5cbfab16a8fb58d6e19
 2016-05-17 18:39:35 +00:00
Kevin Hufnagle
482bf05a8f Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9 
am: 59ce20df8c

* commit '59ce20df8c6573a149461943963e98cee3b11d72':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: Iad0a2bc7ed5554b65e833f8ecb2936ffe4fb4b80
 2016-05-17 18:39:02 +00:00
Felipe Leme
3b91df7ccf Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Id9cb27070e1e72b12c5ade60b637e63319021f90
 2016-05-17 18:39:02 +00:00
Martijn Coenen
225d221945 Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ib327612766f91c583ea0a23e71bac34615edd12d
 2016-05-17 18:38:40 +00:00
Dianne Hackborn
f2ddee2636 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev 
am: 8f359afdc3

* commit '8f359afdc3ce3f243d508e81831ed5f274b65534':
  Fix issue #28641630: Service client dumps are timing out for no reason

Change-Id: I67af48d0e861e77e3bca389970aed1601567f2c7
 2016-05-17 18:38:35 +00:00
Dianne Hackborn
4d7e92b56b Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
 2016-05-17 18:38:28 +00:00
Jorim Jaggi
c3701426c0 Fix janky multi-window entry animation 
am: c5887ea7a0

* commit 'c5887ea7a0b82cc5909743ce14cbda1dcf1dfc82':
  Fix janky multi-window entry animation

Change-Id: I50b123fe6b571009fddbe8bcd39cb876ced87f42
 2016-05-17 18:38:18 +00:00
Chong Zhang
f0b76b071c Fix wallpaper cropped too soon when unminimizing dock 
Set adjusted bounds on the stack that's side-by-side to the docked
stack, so that TaskStack.getDimBounds returns the adjusted bounds
during unminimizing dock animation. This way wallpaper is not cropped
too soon to the final stack bounds.

The adjusted bounds won't be used for alignment for minimizing.

bug: 28763785
Change-Id: Ifea4366dd4b1bd35f2ed720dd1819a10bdfd86fa
 2016-05-17 11:37:43 -07:00
Nicolas Prevot
1dbbe7d664 Refactor how StatusBarPolicy knows if keyguard is visible. 
In the case where the keyguard has never been shown and thus
never been dismissed: StatusBarPolicy thought the keyguard was
still visible.

Instead of StatusBarPolicy keeping its own internal variable
for wether the keyguard is visible, directly use
StatusBarKeyguardViewManager.isShowing()

BUG:28755086
Change-Id: I1b30c0e6985aa7ff35eea41444ab5504c00ff130
 2016-05-17 19:36:44 +01:00
Android Build Merger (Role)
f2bdf486f7 Merge "Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev am: 4570df8fd5 am: c46cc608bc" into nyc-mr1-dev-plus-aosp 2016-05-17 18:33:45 +00:00
Wale Ogunwale
5ba4ca0f44 Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev am: 4570df8fd5 
am: c46cc608bc

* commit 'c46cc608bccc91838d30332bb1134b0223536650':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: If408586d56f7d36d267f1805df4bab15af1842d6
 2016-05-17 18:33:17 +00:00
Bert McMeen
58af97860b docs: Wear preview - update to leftnav am: ca23070a46 
am: 26599cc0e2

* commit '26599cc0e2076bc29e54e319c308f932fa9e3d48':
  docs: Wear preview - update to leftnav

Change-Id: I413265a1fd500bba0f2e84afa28b41cacee192c7
 2016-05-17 18:33:15 +00:00
Martijn Coenen
68b426a30d Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ic36b9392b9475590ba8f75b352d05fba52b1ee02
 2016-05-17 18:33:09 +00:00
Dianne Hackborn
16f6215ef5 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev 
am: 8f359afdc3

* commit '8f359afdc3ce3f243d508e81831ed5f274b65534':
  Fix issue #28641630: Service client dumps are timing out for no reason

Change-Id: I21f2ad5996f13ddd681f805f9941935a846265f1
 2016-05-17 18:32:58 +00:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
 2016-05-17 18:32:46 +00:00
Wale Ogunwale
804b32e925 Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev am: 4570df8fd5 
am: 257c1d882a

* commit '257c1d882a6d567e1be2b766f1dde8e32d662e90':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: Ib9f096c3502936d5e5b5a7fac4b72e480320c806
 2016-05-17 18:30:52 +00:00
Daniel Nishi
a3de878c15 Merge "Add new action for the storage manager settings." into nyc-mr1-dev 
am: b4d5b71cfb

* commit 'b4d5b71cfb55e1d7d6255f3beddcef2a2bc98801':
  Add new action for the storage manager settings.

Change-Id: I0efa5983a3db72cb90542ad852d681bae5b6952d
 2016-05-17 18:30:40 +00:00
Kevin Hufnagle
59ce20df8c Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs 
am: 296d84fbd9

* commit '296d84fbd9f04653edef37aede5e3c0663f8945c':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: If3e7a0663a97f94d46059ed6fdd5b0cc75a0af3c
 2016-05-17 18:30:21 +00:00
TreeHugger Robot
2c6a450fa2 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Kevin Hufnagle
296d84fbd9 Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs 2016-05-17 18:21:31 +00:00
Martijn Coenen
1fef88d8dc Merge "Adddress NFC API review comments." into nyc-dev 2016-05-17 18:21:16 +00:00
Jorim Jaggi
791b7979e9 Fix janky multi-window entry animation 
am: c5887ea7a0

* commit 'c5887ea7a0b82cc5909743ce14cbda1dcf1dfc82':
  Fix janky multi-window entry animation

Change-Id: Ia9a2f19a4c03978c9d05e1628cb0607e1e267401
 2016-05-17 18:20:55 +00:00
Dianne Hackborn
8f359afdc3 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev 2016-05-17 18:20:06 +00:00