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
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
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
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
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
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
smain@google.com
f7304c8cc8 update links to studio docs 
am: 73cf8224cb

* commit '73cf8224cbd97918d6407aac79a97c6ef70b9a30':
  update links to studio docs

Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78
 2016-05-19 23:43:17 +00:00
Chih-Hung Hsieh
032dcff201 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 am: f55c9f7aa6 
am: d5bb8487d5

* commit 'd5bb8487d58b168543d6504504d8e89e062a6b8b':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I779a9fe55406d460cedc1279e3c056e74787c5bb
 2016-05-19 23:39:59 +00:00
Chih-Hung Hsieh
5905c14a59 Merge "Fix misc-macro-parentheses warnings in services jni." am: fe91d2a83d am: d05b6478d5 
am: 03df422689

* commit '03df42268995e3742aeb42ee6a77048dcc8fd889':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: Id2bf8a02360cf917957f77d2cde284dda35e75a1
 2016-05-19 23:39:56 +00:00
Adam Lesinski
d5bb8487d5 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 
am: f55c9f7aa6

* commit 'f55c9f7aa64660712242705d4e5e89e2191bbf69':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I23f28430cf242be3f77926016626ea3e5705d4ec
 2016-05-19 23:34:58 +00:00
Chih-Hung Hsieh
03df422689 Merge "Fix misc-macro-parentheses warnings in services jni." am: fe91d2a83d 
am: d05b6478d5

* commit 'd05b6478d5341f7d70e78fad031d2d426155f68a':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: Ibee251ace2e3f15b98a8f91da0d8450069500177
 2016-05-19 23:34:54 +00:00
smain@google.com
73cf8224cb update links to studio docs 
Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c
 2016-05-19 16:30:43 -07:00
Android Build Merger (Role)
371b110936 Merge "Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837 am: 0720f5885e" into nyc-mr1-dev-plus-aosp 2016-05-19 23:30:14 +00:00
Dirk Dougherty
dcad640fcc Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837 
am: 0720f5885e

* commit '0720f5885e8337f408d7f8be44cc64f83d3f8626':
  Remove outdated google services links.

Change-Id: I28fdb2e4f00fea7ed9519a1ecb039b8e11ebb6d1
 2016-05-19 23:29:41 +00:00
Dirk Dougherty
d57788daa7 Merge "Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc am: 8053c79246 am: f339170837" into nyc-dev-plus-aosp 
am: 0cf5b8d0fe

* commit '0cf5b8d0fe74edfe560b795cf57f268d28a652cd':
  Remove outdated google services links.

Change-Id: I44ca465eb20beebe518e6ca122cc8155687c2324
 2016-05-19 23:29:33 +00:00
Chih-Hung Hsieh
f55c9f7aa6 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 
am: 6f4b566169

* commit '6f4b5661696355d230c515a45aca2dddd8fe99b1':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I5333078964a57c20144acb6b538205bde2782c12
 2016-05-19 23:29:32 +00:00
Chih-Hung Hsieh
d05b6478d5 Merge "Fix misc-macro-parentheses warnings in services jni." 
am: fe91d2a83d

* commit 'fe91d2a83daee3604a49c1bae0744cdde6d14b46':
  Fix misc-macro-parentheses warnings in services jni.

Change-Id: I3ca66bf839e5a720e610657fc9afb6dbb8b853f8
 2016-05-19 23:29:28 +00:00