Commit Graph

244661 Commits

Author SHA1 Message Date
Ruben Brunk
f4907f747c Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev
am: 8ecf66fc83

* commit '8ecf66fc83e76165bea3cd408c687bd0b79c0552':
  Dismiss immersive mode overlay while in VR mode.

Change-Id: I1ab8911349218071003ed4fa9231ea4b8647aa9e
2016-05-17 23:39:39 +00:00
Chong Zhang
da107902d9 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev
am: 65ee55457d

* commit '65ee55457dc39c3e30c677d9126565799b50a8dc':
  Use focused app's stack for IME adjustment

Change-Id: Idd34a63f377f43cb79c397eac8adccef3f791429
2016-05-17 23:34:18 +00:00
Ruben Brunk
8ecf66fc83 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 2016-05-17 23:29:53 +00:00
Chong Zhang
65ee55457d Merge "Use focused app's stack for IME adjustment" into nyc-dev 2016-05-17 23:27:19 +00:00
Roshan Pius
b1e5b7419b Merge "Adjust wifi idle times to fit in system time period" into nyc-dev
am: e1f6975ebc

* commit 'e1f6975ebc1499ddcb493666f884ef0d8e042255':
  Adjust wifi idle times to fit in system time period

Change-Id: Ic47031e1bc2287545382d567114c316bafe12912
2016-05-17 23:19:57 +00:00
TreeHugger Robot
e1f6975ebc Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 2016-05-17 23:07:58 +00:00
smain@google.com
dd840ef116 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 am: 7c919ef804
am: 8ab4d2c0b4

* commit '8ab4d2c0b4fc2c7f67f6100c2264fba49fc6de8a':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: Ic166d97b2fc4ecabe6dbd5e901627d1f45b41087
2016-05-17 23:02:18 +00:00
smain@google.com
8ab4d2c0b4 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500
am: 7c919ef804

* commit '7c919ef8042c1864fb4ea39a663e6ff684bd0156':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I64afc374bb3261b0f5f69a8f4a7677369dfec353
2016-05-17 22:40:42 +00:00
smain@google.com
7c919ef804 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d
am: bf4296e500

* commit 'bf4296e500af87a83ff64642cb15d25e81df01c5':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I9504b2b124e00e0d0bbeea56b7611c57f6bfd9fc
2016-05-17 22:32:26 +00:00
Selim Cinek
be80263275 Merge "Fixed a screen flickering on tablets" into nyc-dev
am: ce80acd73a

* commit 'ce80acd73a5a34d15531d8377fa5b16d0ec5deb7':
  Fixed a screen flickering on tablets

Change-Id: I5829b4044df7605bbeecb0545d2d600384132181
2016-05-17 22:21:37 +00:00
Selim Cinek
d61b5b655e Merge "Fixed a bug with auto cancelling" into nyc-dev
am: a35d9b3ee0

* commit 'a35d9b3ee055d591249a30c58285fe2be5a45c43':
  Fixed a bug with auto cancelling

Change-Id: I46be6f420c4ad89ffc7cd88f621aed173ba130d1
2016-05-17 22:21:32 +00:00
Jim Miller
9e507bd737 Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I8ff47b7b9c340fbf5ef4dfde619a80264ca9c170
2016-05-17 22:21:24 +00:00
smain@google.com
bf4296e500 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246
am: 28445c4d7d

* commit '28445c4d7d46a14e8cc2654c4912019327cbe471':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I243768d45ff5ac5eb11140ac8f8d770335be3d70
2016-05-17 22:21:19 +00:00
Ruben Brunk
c30c8fd29c Dismiss immersive mode overlay while in VR mode.
Bug: 28052143
Change-Id: I750753c72cb8d41bf91c108e8fc645750fbf9c45
2016-05-17 15:15:28 -07:00
Chong Zhang
b8da4a7fa8 Use focused app's stack for IME adjustment
Don't use mInputMethodTarget as it could be set to some system alert
window that has both FLAG_NOT_FOCUSABLE and FLAG_ALT_FOCUSABLE_IM,
and it's not actually taking inputs.

bug: 28328085
Change-Id: I38263f64fec13a5e10357499ebc97671389ba69a
2016-05-17 15:08:44 -07:00
Dianne Hackborn
ab82de14b1 Merge "Work on issue #28689719: Runtime restart" into nyc-dev
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
2016-05-17 22:06:57 +00:00
Selim Cinek
ce80acd73a Merge "Fixed a screen flickering on tablets" into nyc-dev 2016-05-17 22:05:54 +00:00
Selim Cinek
a35d9b3ee0 Merge "Fixed a bug with auto cancelling" into nyc-dev 2016-05-17 22:05:39 +00:00
Jim Miller
2d1c424a0e Merge "Don't always announce accessibility events when resetting password" into nyc-dev 2016-05-17 22:00:37 +00:00
Dianne Hackborn
77ad5f1657 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 2016-05-17 21:58:21 +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
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
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
db41be8ef4 Merge "wifi calling emergency address carrier config" into nyc-mr1-dev 2016-05-17 20:18:03 +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
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
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
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
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
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
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
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
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
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Dianne Hackborn
777a06d3c9 Fix issue #28641630: Service client dumps are timing out for no reason
Actually, no reason.  The reason is that to do the dump we are doing
synchronous calls out to each service, but that is with the activity
manager lock held, so they can get blocked if their main thread does
any call back in to the activity manager.

To fix this, re-organize the dumping code so that the "with client"
path is separate, and doesn't require holding a lock the entire
time.

Change-Id: Ia96861c10da81048b3d2ac93a25760b68623cf34
2016-05-17 11:19:03 -07:00
Bert McMeen
26599cc0e2 docs: Wear preview - update to leftnav
am: ca23070a46

* commit 'ca23070a460ff8cc8942b28d72de341d10102d4c':
  docs: Wear preview - update to leftnav

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

* commit '4570df8fd52b4ca8fab00794297a4f3d3923bbfb':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: I985e8154e396a7a7da91939840f224a1885a792e
2016-05-17 18:14:25 +00:00