Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,385 Commits 3 Branches 0 Tags
47e1e14589cb62de65332ee467e845efc3e43d55
Commit Graph

254385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
77ad5f1657 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 2016-05-17 21:58:21 +00:00
Android Build Merger (Role)
349ca27ce3 Merge "Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 613dc4cc1d" into nyc-mr1-dev-plus-aosp 2016-05-17 21:45:58 +00:00
Wei Jia
68e1651912 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 
am: 613dc4cc1d

* commit '613dc4cc1d902aa9f4ac5a0db375c6e9972ec256':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: I412def216bdb52238b560b0e575ff629473cc0a6
 2016-05-17 21:45:27 +00:00
Wei Jia
68e8d86b02 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 
am: 8a53cc9e26

* commit '8a53cc9e267d88f013402ea246ca507c494ccea4':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: If80c04ca3a7a61ee774e0353eb69d1017a31ffdc
 2016-05-17 21:44:49 +00:00
Wei Jia
8a53cc9e26 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev 
am: c4e8471ba4

* commit 'c4e8471ba4afb0d2cae0d9e29f5c14b4bbfe4524':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: I1b883f4fe46ebb150841f5a75517a8340597edba
 2016-05-17 21:39:05 +00:00
Wei Jia
613dc4cc1d Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev 
am: c4e8471ba4

* commit 'c4e8471ba4afb0d2cae0d9e29f5c14b4bbfe4524':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: Id138df3cfe1ee989d4abf52ae283b63419e7047a
 2016-05-17 21:39:01 +00:00
Android Build Merger (Role)
4fa6801180 Merge "Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: d91b14d862" into nyc-mr1-dev-plus-aosp 2016-05-17 21:23:36 +00:00
Adrian Roos
5db7ac8086 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 
am: d91b14d862

* commit 'd91b14d862568233d3467bb91497a3aabeecab29':
  Fix broken MessagingStyle

Change-Id: If3cd26444ee728e5b71eb3921aaa983591d0d8a1
 2016-05-17 21:23:10 +00:00
Adrian Roos
31459c3202 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 
am: efc9c88d00

* commit 'efc9c88d002263f748716405f7e63becc3685211':
  Fix broken MessagingStyle

Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
 2016-05-17 21:22:39 +00:00
Wei Jia
c4e8471ba4 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev 2016-05-17 21:17:37 +00:00
Adrian Roos
efc9c88d00 Merge "Fix broken MessagingStyle" into nyc-dev 
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
 2016-05-17 21:17:33 +00:00
Adrian Roos
d91b14d862 Merge "Fix broken MessagingStyle" into nyc-dev 
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I611823cbd36336828f6ee1b57a6cef3908d8ef6f
 2016-05-17 21:17:10 +00:00
Roshan Pius
684591116f Adjust wifi idle times to fit in system time period 
The battery stats time period calculation is done using a
different clock source compared to the wifi chip's on time calculation. So,
account for skews between the two by adjusting the idle time reported by
wifi chip to fit into the system time calculation.

BUG: 28628799
Change-Id: I3110c53317f3246e26fdc3731f7be0a3d9c8e229
TEST: Compiles & manual verification
 2016-05-17 14:11:22 -07:00
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +00:00
Dianne Hackborn
2675616719 Work on issue #28689719: Runtime restart 
There are few paths I can see to get a null intent down into
the framework at this point.  Add in some checks and reports
at those places to mitigate and report such problems.

Change-Id: If235bf342558321d3fabe9363fcebb2bcea18df1
 2016-05-17 13:40:44 -07:00
Vineeta Srivastava
14fd0ca669 Merge "wifi calling emergency address carrier config" into nyc-mr1-dev 
am: db41be8ef4

* commit 'db41be8ef4c1c3364eaf3b552f0037f80cd0fe0f':
  wifi calling emergency address carrier config

Change-Id: I5d1ff70da4e92637e77d144eba70009a12ced185
 2016-05-17 20:26:41 +00:00
Vineeta Srivastava
db41be8ef4 Merge "wifi calling emergency address carrier config" into nyc-mr1-dev 2016-05-17 20:18:03 +00:00
Julia Reynolds
df0268f03e Merge "Title is a CharSequence." into nyc-dev am: 94789b4ddf 
am: eac3096666

* commit 'eac30966669a09dd431a34c574c257f14b88b802':

Change-Id: Ic47ad5e85ee9ee8751335f9ec68b5e3abb9f9b62
 2016-05-17 20:03:45 +00:00
Julia Reynolds
073ebc776c Merge "Title is a CharSequence." into nyc-dev am: 94789b4ddf 
am: 6003616501

* commit '6003616501688d8ed0ac10e75a017349c86dd375':
  Title is a CharSequence.

Change-Id: I921be25c7bb076966bf8d5c1c940c99f47272871
 2016-05-17 19:59:41 +00:00
Julia Reynolds
eac3096666 Merge "Title is a CharSequence." into nyc-dev 
am: 94789b4ddf

* commit '94789b4ddff239760adf91896bd6ea86b62d0137':
  Title is a CharSequence.

Change-Id: I62839dc7fd216454bd8b43b9905a241bed31948b
 2016-05-17 19:55:49 +00:00
Julia Reynolds
6003616501 Merge "Title is a CharSequence." into nyc-dev 
am: 94789b4ddf

* commit '94789b4ddff239760adf91896bd6ea86b62d0137':
  Title is a CharSequence.

Change-Id: I7eedd41ca91201469ad2d8a9ad16e69843d7b8d6
 2016-05-17 19:55:33 +00:00
Julia Reynolds
94789b4ddf Merge "Title is a CharSequence." into nyc-dev 2016-05-17 19:48:33 +00:00
Julia Reynolds
7f9ce782a0 Title is a CharSequence. 
Change-Id: Ib464d422ca1cf6d7c0547a02847ecb7085682ae9
Fixes: 28680336
 2016-05-17 15:34:34 -04:00
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