Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,495 Commits 3 Branches 0 Tags
84ed074c19a8728482942bd179eaef7bf25ef14e
Commit Graph

261495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Jia
84ed074c19 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 8a53cc9e26 
am: 68e8d86b02

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

Change-Id: I363fa893c1e895168c9a41293a167f606f289c2e
 2016-05-17 21:49:21 +00:00
Adrian Roos
9770cdc5b1 Merge "Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: d91b14d862" into nyc-mr1-dev-plus-aosp 
am: 4fa6801180

* commit '4fa68011809a199c1ac4e340640d65abea420253':

Change-Id: Ied804aced773e03bc02bdbac87fc84716d87c66d
 2016-05-17 21:45:28 +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
Adrian Roos
e5b0923a02 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: efc9c88d00 
am: 31459c3202

* commit '31459c32028951101a338abf95e48d9143444914':
  Fix broken MessagingStyle

Change-Id: Ibc65e18c45862df50fc651028ce2347af886d7c6
 2016-05-17 21:38:31 +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
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +00:00
Sergei Vasilinetc
0353c378ba Merge "Add gmock to hwui library" 2016-05-17 21:00:02 +00:00
Vineeta Srivastava
cc686af36e Merge "wifi calling emergency address carrier config" into nyc-mr1-dev am: db41be8ef4 
am: 14fd0ca669

* commit '14fd0ca66912377cd764ba487539cf1cd0190da5':
  wifi calling emergency address carrier config

Change-Id: Id000c0faf2e084aee7a6b2af888c4154a24b11a9
 2016-05-17 20:30:47 +00: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
cb334b7c32 Merge "Title is a CharSequence." into nyc-dev am: 94789b4ddf am: eac3096666 
am: df0268f03e

* commit 'df0268f03e5742e51bd9640829a86ed51366a5a1':

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

* commit '073ebc776c0b1c20781ddaa79036c4220448b201':
  Title is a CharSequence.

Change-Id: I1361835ceeb3b8c5faff61c37ae7c6aea37e91e7
 2016-05-17 20:04:51 +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
Garfield Tan
38c22fd551 Merge "Use thumbnail of other sizes if it's missing in current size." 2016-05-17 19:55:12 +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
sergeyv
8bd5edf804 Add gmock to hwui library 
Change-Id: I1dec4cd234e5ee8bb01140b969d0cf817a849047
 2016-05-17 12:22:55 -07:00
Jae Seo
66d515c275 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 
am: 45fab75ab6

* commit '45fab75ab62cdfcd4e353b777e3d1d2e60a383c7':

Change-Id: I487c649bea97ec9fdc07975d11d47c9697baf370
 2016-05-17 19:10:46 +00:00
Kevin Hufnagle
71eb364df8 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 
am: 4ee5e1b69b

* commit '4ee5e1b69bd6a7ecc85fc4b47e04cfbbb1c449e7':

Change-Id: I0f370ca6fa6d0c4d2e6c34273c0334870cc9583a
 2016-05-17 19:10:40 +00:00
Jae Seo
7128f82cea Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 am: 3488ed71d2 
am: d0006f584f

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

Change-Id: Ifc07ec617b326bc29e7126116aa2a33a9d635bee
 2016-05-17 19:10:29 +00:00
Kevin Hufnagle
763c7a2a79 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 
am: b9aef689e1

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

Change-Id: Ieef94c6539baf52fc5325008781a05f0690914b9
 2016-05-17 19:10:15 +00:00
Bert McMeen
26e13edfc7 Merge "docs: Wear preview - update to leftnav am: ca23070a46 am: 26599cc0e2 am: 58af97860b am: 257f6e8516" into nyc-mr1-dev-plus-aosp 
am: 1c06a8bb40

* commit '1c06a8bb40b07b4e1c77168db88aedb8940fd430':

Change-Id: I2a00ed3a841ce6f7b03df8056386a1b16fea17a8
 2016-05-17 19:10:00 +00:00
Felipe Leme
07a6338f69 Merge "Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 am: f45186e311" into nyc-mr1-dev-plus-aosp 
am: 333c247356

* commit '333c2473565a72126fab4dbd5bed3917280af0ab':

Change-Id: Ic593bbfcf2c90d588858c9e2ae516f0a3162ca52
 2016-05-17 19:08:04 +00:00
Bert McMeen
d0da6d500a docs: Wear preview - update to leftnav am: ca23070a46 am: 26599cc0e2 am: 58af97860b am: 4be34de36a 
am: 284bb99059

* commit '284bb99059a36180710e4a62d277a7efe4fe8dab':
  docs: Wear preview - update to leftnav

Change-Id: I9bf9a9d129cf18821c2751102f3234070c56247b
 2016-05-17 19:07:37 +00:00
Felipe Leme
b206fa10e7 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 am: 3b91df7ccf 
am: 8b297e554d

* commit '8b297e554df11ee874e01e4bfaa2b64d9af2bc11':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Ieb58dda8f4749ccf5218be5913beb488fd3247cf
 2016-05-17 19:07:18 +00:00
Martijn Coenen
2ef0a5ca85 Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc am: 225d221945 
am: 3a5379285d

* commit '3a5379285d31ef594b31b8d6112a1930c022825a':

Change-Id: I0f4f385a0a1b40bf056af758cf8e8621d8800228
 2016-05-17 19:06:59 +00:00
Dianne Hackborn
9ffba6f532 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev am: 8f359afdc3 am: f2ddee2636 
am: 0439cf9c11

* commit '0439cf9c119230cde4a31bc53c3e4f72bd916a75':

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

* commit '6189716d0834eaf21137c9e0178e9a6330c9890a':

Change-Id: I8485468106fdf770d9c443f7662edb1578a23ecd
 2016-05-17 19:05:13 +00:00
Jorim Jaggi
15846f25f0 Fix janky multi-window entry animation am: c5887ea7a0 am: c3701426c0 
am: 261f4c6533

* commit '261f4c6533cf7e8d00dabb8d870e6236924d6bd0':

Change-Id: I78e988b0c9f38b773579a662e351c0b57d62844c
 2016-05-17 19:04:49 +00: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