Commit Graph

266851 Commits

Author SHA1 Message Date
Ta-wei Yen
621b68a213 Merge "Rename visual voicemail sync intent value" into nyc-dev
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
2016-05-20 01:06:03 +00:00
Ta-wei Yen
4f2a1d0913 Merge "Hide VoicemailContract.setQuota()" into nyc-dev 2016-05-20 01:00:30 +00:00
Ta-wei Yen
0f712b164f Merge "Rename visual voicemail sync intent value" into nyc-dev 2016-05-20 01:00:04 +00:00
Ji Yang
a8bb6dbd2c Rename carrier messaging API constant.
BUG: 28842531
Change-Id: Ia0b249540cfb59f952e9c578370c54f2f98d2bc0
2016-05-19 17:46:50 -07:00
Hemal Patel
6ede11775d Merge "Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6 am: a18a3d3211 am: 99a9b165e8 am: 98c5daf98a" into nyc-mr1-dev-plus-aosp
am: 6625924f7a

* commit '6625924f7a8ff126baf9fbf3b36270d11359f710':

Change-Id: I3b8ab778b216c42d94a85406dc53a75e3219719b
2016-05-20 00:43:14 +00:00
Hemal Patel
73dd4e1cae Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6 am: a18a3d3211 am: 99a9b165e8 am: 070cb41933
am: ab9663ebfa

* commit 'ab9663ebfa97b45750c5dcd79ff3d308fd4e7e75':
  Docs: Fixed a wrong file name

Change-Id: I183f8dfebe23d00a39713dfb45dec48fc0a22e2e
2016-05-20 00:43:09 +00:00
Cheryl Potter
768f5ebe5b Merge "Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 am: 0793d19267 am: 212fe6c071 am: e6192a3aad" into nyc-mr1-dev-plus-aosp
am: 88cd7d4bb1

* commit '88cd7d4bb1d853fe142554c08ba1d71524fa894e':

Change-Id: Iccb100e9cf1366f1dd343160e86447a5b87529f4
2016-05-20 00:43:02 +00:00
smain@google.com
b9f103c808 Merge "Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10 am: eaad66b697 am: d1515a26e8" into nyc-mr1-dev-plus-aosp
am: 069ffaba13

* commit '069ffaba1332570e6ff5488c236c0efe81a8f198':

Change-Id: Ia9a2aedc7708d823fce787e56542b74f4a50ebb1
2016-05-20 00:37:58 +00:00
Android Build Merger (Role)
6625924f7a Merge "Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6 am: a18a3d3211 am: 99a9b165e8 am: 98c5daf98a" into nyc-mr1-dev-plus-aosp 2016-05-20 00:37:49 +00:00
Cheryl Potter
26dd3f6cc2 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 am: 0793d19267 am: 212fe6c071 am: dba7d004e2
am: a302cb09e0

* commit 'a302cb09e09ab0dbfd339377da904565d0ff543e':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: I37bf3a257192f0874658b53db7bd9e18a021d435
2016-05-20 00:37:49 +00:00
Scott Main
c994ef1317 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10 am: eaad66b697 am: 7422c51fd0
am: 35fbe1909f

* commit '35fbe1909fe26e693fff7411a0d2d74d0b84aef3':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I1b9918789a3f88e59dbb47667c96a46a058a029b
2016-05-20 00:37:38 +00:00
Hemal Patel
ab9663ebfa Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6 am: a18a3d3211 am: 99a9b165e8
am: 070cb41933

* commit '070cb41933350396a99d6de180e53d0531caa472':
  Docs: Fixed a wrong file name

Change-Id: I030e59345d3b063211949ae8ede8834bc7416632
2016-05-20 00:37:26 +00:00
Hemal Patel
b3b2fa4237 Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6 am: a18a3d3211 am: 99a9b165e8
am: 98c5daf98a

* commit '98c5daf98ada08e6fc6e3a4c95114f101fbc51fe':
  Docs: Fixed a wrong file name

Change-Id: I58364a9435bf9c273c206729ac4b455948da77da
2016-05-20 00:37:26 +00:00
smain@google.com
31e3f5c67f Merge "update links to studio docs am: 73cf8224cb am: f7304c8cc8 am: 69428b4a0a am: 9bcd8e509c" into nyc-mr1-dev-plus-aosp
am: c1c1e02fed

* commit 'c1c1e02fede8e0b91bc255afb1fa52f9ac87e4cb':

Change-Id: Icc392af873c08826a0bdcd08a7eadf3576d211cb
2016-05-20 00:37:25 +00:00
smain@google.com
7066f6bb77 update links to studio docs am: 73cf8224cb am: f7304c8cc8 am: 69428b4a0a am: 0cd3a78a0d
am: 99e56dbd64

* commit '99e56dbd649936f835e04dabaa99d403a7376e5f':
  update links to studio docs

Change-Id: I740f16c5281d850ba4cf727c18ade2beb4d44384
2016-05-20 00:37:10 +00:00
Hemal Patel
98c5daf98a Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6 am: a18a3d3211
am: 99a9b165e8

* commit '99a9b165e8ad31aa9e3609c7f3d1d4e02a1072cd':
  Docs: Fixed a wrong file name

Change-Id: I475a41513ac45ace7bf2387e4a72ef8fd5cd7e15
2016-05-20 00:30:39 +00:00
Hemal Patel
070cb41933 Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6 am: a18a3d3211
am: 99a9b165e8

* commit '99a9b165e8ad31aa9e3609c7f3d1d4e02a1072cd':
  Docs: Fixed a wrong file name

Change-Id: I65827263125951ec157ca2f0c891774fc4d6f0ad
2016-05-20 00:30:28 +00:00
Android Build Merger (Role)
88cd7d4bb1 Merge "Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 am: 0793d19267 am: 212fe6c071 am: e6192a3aad" into nyc-mr1-dev-plus-aosp 2016-05-20 00:27:32 +00:00
Android Build Merger (Role)
069ffaba13 Merge "Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10 am: eaad66b697 am: d1515a26e8" into nyc-mr1-dev-plus-aosp 2016-05-20 00:27:23 +00:00
Cheryl Potter
71c04aae28 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 am: 0793d19267 am: 212fe6c071
am: e6192a3aad

* commit 'e6192a3aad92e1bac1e7229739d3e1919d309d71':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: I066daa0a6fd123ea1b0b97a6706ae9c6eeb9bcd3
2016-05-20 00:26:53 +00:00
Cheryl Potter
a302cb09e0 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 am: 0793d19267 am: 212fe6c071
am: dba7d004e2

* commit 'dba7d004e2b7f8f9802ef85d290b543c3eb5860c':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: I25c309a4062035d6695d5997b439dfc1b6606c88
2016-05-20 00:26:48 +00:00
smain@google.com
f5bc587bfa Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10 am: eaad66b697
am: d1515a26e8

* commit 'd1515a26e8a2ccfc04e55c9ad84ac5adcad410ca':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: Ide9ab23c3241852d9b2321c08e15cb38bda83197
2016-05-20 00:26:46 +00:00
smain@google.com
35fbe1909f Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10 am: eaad66b697
am: 7422c51fd0

* commit '7422c51fd0236d32fe554972c41d7217e22c7eef':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I997b2cfba38019ee9f353550972b8ebcf7931f36
2016-05-20 00:26:40 +00:00
Hemal Patel
99a9b165e8 Merge "Docs: Fixed a wrong file name" into mnc-io-docs am: 06a9fbcdd6
am: a18a3d3211

* commit 'a18a3d32118872907e0979856f5906752360b058':
  Docs: Fixed a wrong file name

Change-Id: I93ac53610c9c1b0aad68e525eed3d8703bfde613
2016-05-20 00:25:49 +00:00
Chad Brubaker
c845b2a21c Use an attribute for the network security config resource
Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.

Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
2016-05-19 17:25:41 -07:00
Adam Lesinski
d84ad30ee6 Fix parsing of kernel wakelocks
We handled stale wakelocks (wakelocks that disappear from /d/wakeup_sources)
differently in previous version of Android. They would be set stale, but still be
updated with their previous counts (they would never disappear).

The method setStale has been replaced with endSample(), which is semantically different.
Once a SamplingTimer has endSample() called, it expects any future calls to update() to
be a new sample, meaning the entire amount passed to update() is included in the kernel
wakelock's total. Since stale wakelocks were never removed from the list, this would
increase by large amounts when nothing had actually changed.

This was exacerbated by the fact that there was a bug where the last wakelock in
/d/wakeup_sources was never parsed, so if the order ever changed, this "stale" wakelock
would suddenly re-appear and the entire amount reported would be charged to the wakelock,
instead of just the difference since the last update.

All this was exposed when we added support to handle wakelocks that would disappear and
reappear with smaller values, meaning the kernel had pruned them from its accounting and
reset them.

Bug:28601080
Change-Id: Ic96027f7d580dac5e20aa73d67e5cedac4ccabeb
2016-05-19 17:21:10 -07:00
Cheryl Potter
e6192a3aad Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 am: 0793d19267
am: 212fe6c071

* commit '212fe6c0714bb79d70d3ea424eea8211ee1421f5':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: I57929cc1788085e2a61aa45e093d21eb2f2f4806
2016-05-20 00:19:40 +00:00
Hemal Patel
a18a3d3211 Merge "Docs: Fixed a wrong file name" into mnc-io-docs
am: 06a9fbcdd6

* commit '06a9fbcdd68a3d48697e6e88c04fcdb6040673c5':
  Docs: Fixed a wrong file name

Change-Id: I7f672848dfc1f77a2559494c34de6d5cc70df130
2016-05-20 00:19:35 +00:00
Scott Main
d1515a26e8 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10
am: eaad66b697

* commit 'eaad66b697b3605c1b5b75bb203ea308dee2589c':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I14dde8c5eebec9ce9d9a416cd071393d53e59b8a
2016-05-20 00:19:34 +00:00
Cheryl Potter
dba7d004e2 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702 am: 0793d19267
am: 212fe6c071

* commit '212fe6c0714bb79d70d3ea424eea8211ee1421f5':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: Iea77250d360a10567016eb0975fa94df0b832a90
2016-05-20 00:19:29 +00:00
Scott Main
7422c51fd0 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10
am: eaad66b697

* commit 'eaad66b697b3605c1b5b75bb203ea308dee2589c':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I3a8035cfb8cb03315cb47344f432e88b4dcac205
2016-05-20 00:19:24 +00:00
Hemal Patel
06a9fbcdd6 Merge "Docs: Fixed a wrong file name" into mnc-io-docs 2016-05-20 00:15:09 +00:00
Cheryl Potter
212fe6c071 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118 am: f2fa5cd702
am: 0793d19267

* commit '0793d1926729cdfd6cd023e89e45b21c63c1d91d':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: I183e31bdf55e6e691785430d65d4cf2934a2f7ef
2016-05-20 00:14:07 +00:00
smain@google.com
eaad66b697 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc
am: ccf143ea10

* commit 'ccf143ea106de35de35d4829ade55ba78b7a3fee':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I42306e09cb173642840ee29130bb80e9da347a81
2016-05-20 00:14:02 +00:00
Cheryl Potter
0793d19267 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs am: d382293118
am: f2fa5cd702

* commit 'f2fa5cd7022d450d4e0faa4c81db5207d1ec00d3':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: Iacbf1fca2c1d3189a39122e893ece5fcf033246a
2016-05-20 00:11:13 +00:00
Cheryl Potter
f2fa5cd702 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs
am: d382293118

* commit 'd382293118dad1337726986c1f2465d2ec25171b':
  docs: Fix card descriptions in Android Monitor Overview page b/2885829

Change-Id: Ieadb04df863e4f50db2b1b6168cc31f6501fa242
2016-05-20 00:08:47 +00:00
Scott Main
ccf143ea10 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44
am: 9ad92619dc

* commit '9ad92619dc455a42c40e5b102e2fdf65c2787549':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: I52fc62f8f233682a6707a4c1e5ef67f42844551b
2016-05-20 00:08:46 +00:00
Michael Kwan
246caaced5 Initial update of Micro theme for Material design.
Bug: 17733928
Change-Id: I7e0ccaa0dd7ee3209c3e517cdfc77dd374b1ce6f
2016-05-19 17:07:11 -07:00
Android Build Merger (Role)
c1c1e02fed Merge "update links to studio docs am: 73cf8224cb am: f7304c8cc8 am: 69428b4a0a am: 9bcd8e509c" into nyc-mr1-dev-plus-aosp 2016-05-20 00:05:52 +00:00
smain@google.com
bb0d6a90e1 update links to studio docs am: 73cf8224cb am: f7304c8cc8 am: 69428b4a0a
am: 9bcd8e509c

* commit '9bcd8e509ce0906445899435d59f4666d1e93e83':
  update links to studio docs

Change-Id: I2665a3df257ad693eb5607cfd3a051472bda6417
2016-05-20 00:05:20 +00:00
smain@google.com
9ad92619dc Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs
am: 486f792d44

* commit '486f792d4448819c47c7e18dfd4ccb40133df528':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: Iffb768397f425b34c1e297d40c9b1077d1e7ad5d
2016-05-20 00:05:01 +00:00
smain@google.com
99e56dbd64 update links to studio docs am: 73cf8224cb am: f7304c8cc8 am: 69428b4a0a
am: 0cd3a78a0d

* commit '0cd3a78a0d4d3a5ebc377a06f00af5796cc470c4':
  update links to studio docs

Change-Id: I4f9d8acf320fe2a5e3da594ed446ff1c71b83c8e
2016-05-20 00:04:35 +00:00
Cheryl Potter
d382293118 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs 2016-05-20 00:03:07 +00:00
Christopher Tate
ea2d6e8e89 Back up / restore the 'mono audio' setting
Bug 28437565

Change-Id: I6028886eb1aa424edabca65ad9d11d984b82d198
2016-05-19 16:55:49 -07:00
Cheryl Potter
72686af4f6 docs: Fix card descriptions in Android Monitor Overview page
b/2885829

Change-Id: I2c36d9889f685ea6f18859f5859d876da55ba034
2016-05-19 16:55:49 -07:00
smain@google.com
0cd3a78a0d update links to studio docs am: 73cf8224cb am: f7304c8cc8
am: 69428b4a0a

* commit '69428b4a0ad9b3bed3c31bbf3dff4d61548af77a':
  update links to studio docs

Change-Id: Ia2b3f1b7556c01c2bebed8d50a43a05def067b3b
2016-05-19 23:55:01 +00:00
Scott Main
486f792d44 Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs 2016-05-19 23:54:20 +00:00
smain@google.com
9bcd8e509c update links to studio docs am: 73cf8224cb am: f7304c8cc8
am: 69428b4a0a

* commit '69428b4a0ad9b3bed3c31bbf3dff4d61548af77a':
  update links to studio docs

Change-Id: I6ebfa3b240ffe0b3b9a64e4c065410d98e73ccaa
2016-05-19 23:53:56 +00:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
smain@google.com
69428b4a0a update links to studio docs am: 73cf8224cb
am: f7304c8cc8

* commit 'f7304c8cc8aa947558be355fd0c547f418e44931':
  update links to studio docs

Change-Id: I9886a9618513c63f02add34b12761f8d35afb1da
2016-05-19 23:47:54 +00:00