Commit Graph

6588 Commits

Author SHA1 Message Date
Ricky Wai
7b1ccf8700 Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp
am: b5e2592582

* commit 'b5e25925828dd5a23eaa2ea3a4cebcc6652d2762':
  Hide work profile key in user credentials screen

Change-Id: Ie10f57378d3cf1168a9200bf02f3b46d2d1bfe4b
2016-05-25 13:34:55 +00:00
Ricky Wai
750229fdf0 Hide work profile key in user credentials screen am: d398244513
am: ed39b3b166

* commit 'ed39b3b1666cff34e34c394029fad0ad9e426968':
  Hide work profile key in user credentials screen

Change-Id: I18cefc9f365ed83db5262676a1f4b9cc28b20c07
2016-05-25 13:27:41 +00:00
Ricky Wai
ed39b3b166 Hide work profile key in user credentials screen
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I5273b53b07cb80d45bac61c8dcc5cba8f6b11b3a
2016-05-25 13:20:51 +00:00
Ricky Wai
d398244513 Hide work profile key in user credentials screen
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
2016-05-25 13:11:09 +00:00
Keisuke Kuroyanagi
32c0e434a7 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978 am: 66e5b59d85
am: c2a363fd24

* commit 'c2a363fd24a95e8afd9124e88e7c8227849744cf':
  Set input method mode for CascadingMenuPopup.

Change-Id: If142a782c2cf9b930e16382ab3986dd11821ed1b
2016-05-25 02:20:36 +00:00
Keisuke Kuroyanagi
c2a363fd24 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev am: edebcae978
am: 66e5b59d85

* commit '66e5b59d852e7a746945b0a729cda287bd922187':
  Set input method mode for CascadingMenuPopup.

Change-Id: Ie9efc3abeec02062baccb68615b1ccee5526abd8
2016-05-25 02:17:01 +00:00
Keisuke Kuroyanagi
66e5b59d85 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev
am: edebcae978

* commit 'edebcae9781fa897914952e9346a14afd2e08967':
  Set input method mode for CascadingMenuPopup.

Change-Id: I22fcbfb60161aaa660abc43bc9f739829f8e53a5
2016-05-25 02:11:22 +00:00
Keisuke Kuroyanagi
edebcae978 Merge "Set input method mode for CascadingMenuPopup." into nyc-dev 2016-05-25 02:06:25 +00:00
Tianjie Xu
9ae172f9b9 Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: 7135fab76c
am: 375a512c0d

* commit '375a512c0d99e58285b3e6d6f1045c5e3a9774d5':
  Report OTA time statistics

Change-Id: Icbd611fe4af2dd51d1ee946a80c0e0f4370a9634
2016-05-24 21:59:28 +00:00
Tianjie Xu
375a512c0d Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9
am: 7135fab76c

* commit '7135fab76cb3e7f7a68547794b3ddf54f08facca':
  Report OTA time statistics

Change-Id: I82f174bfa383a26a87d45ac6675a3ae5812b50af
2016-05-24 21:47:52 +00:00
Michael Kwan
aeee0882f2 Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev am: 02178609c6
am: 9fcefb4c1d

* commit '9fcefb4c1d8554df4c8c14337e875bb33042d12f':
  Fixed issue where ListView checked state did not account for ListView header.

Change-Id: I24a239d5faa0b8b0c00384268fb02a817ad771f3
2016-05-24 21:41:30 +00:00
Tianjie Xu
7135fab76c Merge "Report OTA time statistics" into nyc-dev
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I941b48f287fe72dbb3e0f61ccdea33deab3c34c5
2016-05-24 21:41:05 +00:00
Michael Kwan
9fcefb4c1d Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev
am: 02178609c6

* commit '02178609c69d395d7ddbae2db278e50572cceec3':
  Fixed issue where ListView checked state did not account for ListView header.

Change-Id: I6f5fd65a9632a2f262c2e7a807cae487c4d5c0bc
2016-05-24 21:35:07 +00:00
Michael Kwan
dcb28fff58 Fixed issue where ListView checked state did not account
for ListView header.

Bug: 17733928
Change-Id: If8e9daa9c9538ac86493045bc597461b44a2f823
2016-05-24 13:07:55 -07:00
Tianjie Xu
dcd3644f22 Report OTA time statistics
Read time and I/O for OTA update from last_install, and report the
statistics using MetricsLogger.histogram.

Bug: 28658632
Change-Id: I7fd06a82cbabd346d6d44f81ebad08f6baf4b8d0
2016-05-24 13:00:30 -07:00
Michael Kwan
827aab5c39 Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev am: 1d66ae128d
am: 4cf99bed0f

* commit '4cf99bed0f987e09e0f1a73d92b1c62dd40d144d':
  Initial update of Micro theme for Material design.

Change-Id: I9dd4a4e7bf03389b6fde91ce7f4c41e85aab4b5e
2016-05-24 19:12:40 +00:00
Michael Kwan
4cf99bed0f Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev
am: 1d66ae128d

* commit '1d66ae128d3b81623891e07fc9f5dfd15ee055c4':
  Initial update of Micro theme for Material design.

Change-Id: Iffb58e0f0d45796d2951c3566f72db058d665b5a
2016-05-24 18:54:56 +00:00
Michael Kwan
1d66ae128d Merge "Initial update of Micro theme for Material design." into nyc-mr1-dev 2016-05-24 18:47:06 +00:00
Toby Sargeant
450d664e90 Merge "Refactor ZygoteInit to support a WebView-specific zygote." 2016-05-24 08:45:04 +00:00
Joe Onorato
8472eee461 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: c3db3e217f
am: 4f5febce80

* commit '4f5febce80711166077bb9b40d76bc51cc8cf848':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I9e404c94c56fcb0a62a141b353dd76932947ca76
2016-05-23 21:54:59 +00:00
Joe Onorato
4f5febce80 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971
am: c3db3e217f

* commit 'c3db3e217f397153e9982bb29e37fc28e01062d2':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: Iddfcdfeb0ad1194488ce504d420696a83d20a786
2016-05-23 19:54:10 +00:00
Joe Onorato
c3db3e217f Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: Ic86eb0ad4278dc2d0b7f93148bab00a1f707dc16
2016-05-23 19:50:45 +00:00
Joe Onorato
97cdd11f2a Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I3c455fe69244927dc5aebdf5ddb7b0badf6aeee8
2016-05-23 19:50:36 +00:00
Joe Onorato
c23befa183 Add data from /proc/pagetypeinfo to procstats.
This data tells us the number of pages of each type that
are available by page size.  It is collected each time
the procstats snapshot is taken, and printed in the
checkin and verbose (dumpsys procstats -a) modes.

Change-Id: I14562eac15833617391c560638a9e7d239ef8db6
2016-05-23 11:33:11 -07:00
Simon Baldwin
ba816e0c9e Refactor ZygoteInit to support a WebView-specific zygote.
This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.

* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.

Bug: 22084679
Bug: 21643067
Change-Id: I4c508a42af7ab7b53d10570ad53b846df7782cc4
2016-05-23 15:26:25 +01:00
Victor Chang
a0e421d4e9 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 1e93177121
am: 8dda22449b

* commit '8dda22449b47ff3f9fa22c8ee790baaa502ef610':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: Ibb8312c7e8b5920ecd4790882ba63c132b913a47
2016-05-23 12:09:32 +00:00
Victor Chang
8dda22449b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b
am: 1e93177121

* commit '1e93177121848f337c512b7ce0d06265abb02356':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: If568c19a9fb67eb847b776981a42049cececfe45
2016-05-23 12:03:40 +00:00
Victor Chang
8806a4bdc8 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4
2016-05-23 11:59:02 +00:00
Victor Chang
1e93177121 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
2016-05-23 11:58:41 +00:00
Victor Chang
d86ac8116b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 2016-05-23 11:51:56 +00:00
Robert Carr
a7dfbc9437 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp
am: abb81c5972

* commit 'abb81c59729ad97e1207449c84f8e96986ea2a6a':
  Correctly clear resizing drawable when nulling background.

Change-Id: I50ee5eda0a88af238719a83a3e39ed81da0f2dbe
2016-05-20 23:13:36 +00:00
Robert Carr
ac0ed76278 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43
am: fe25025c5c

* commit 'fe25025c5c9e551599a8ce5228cc5d4b41385f3b':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ib93cee44edc0317a806d90ea2b2a44d293af1c1f
2016-05-20 23:08:20 +00:00
Robert Carr
89770ebf62 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: I9cbb109bbd7891c30711a68bf88d8b2c4332baa3
2016-05-20 23:01:03 +00:00
Robert Carr
fe25025c5c Merge "Correctly clear resizing drawable when nulling background." into nyc-dev
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ifb02cc95efc8b164ab8ee63fa9d83bae3172da23
2016-05-20 23:01:02 +00:00
TreeHugger Robot
a3ec065a43 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 2016-05-20 22:56:47 +00:00
Adam Lesinski
6028e28986 Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp
am: 768542e38d

* commit '768542e38d356bd18cb567dacc89c504d128ccd4':
  Fix parsing of kernel wakelocks

Change-Id: Ic5b48697830e96528cd87a579f0ee8a5ab665bf9
2016-05-20 17:43:40 +00:00
Adam Lesinski
fea0c3af7a Merge "Fix parsing of kernel wakelocks" into nyc-dev
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e
2016-05-20 17:32:42 +00:00
Adam Lesinski
acb5ac77a3 Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214
am: 7dd96663a0

* commit '7dd96663a0c728b4913ed4146cc442336833a1ca':
  Fix parsing of kernel wakelocks

Change-Id: I312c22fdbee545a2f7991c320ee4d5eea73decba
2016-05-20 17:32:04 +00:00
Adam Lesinski
7dd96663a0 Merge "Fix parsing of kernel wakelocks" into nyc-dev
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: I8627d87ce84e9c03407a8e5be353aa44635a7712
2016-05-20 17:27:23 +00:00
Adam Lesinski
6f0d399214 Merge "Fix parsing of kernel wakelocks" into nyc-dev 2016-05-20 17:23:08 +00:00
Neil Fuller
7efd7d6ef2 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
am: 761f70d5a6

* commit '761f70d5a6b926780db3bba95ee1e01b4d8d95be':
  Add support for ICU data pinning in the Zygote

Change-Id: If693e8cbb737186fdf0a3169d024bef08c8ceb6a
2016-05-20 13:00:29 +00:00
Neil Fuller
761f70d5a6 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev 2016-05-20 12:53:48 +00: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
Michael Kwan
246caaced5 Initial update of Micro theme for Material design.
Bug: 17733928
Change-Id: I7e0ccaa0dd7ee3209c3e517cdfc77dd374b1ce6f
2016-05-19 17:07:11 -07:00
Robert Carr
692a5feab9 Correctly clear resizing drawable when nulling background.
When a null window background is set, we want to use the
fallback drawable for resizing.

Bug: 28801472

Change-Id: Ia616d7aa18b0d7aa2c7081a85ce7551ecfeca5b3
2016-05-19 15:11:14 -07:00
Sergio Giro
cfc00030cc resolve merge conflicts of 882c7d2 to master
Change-Id: I1235236c405e46fc984c7dda743fc6815ba7aab9
2016-05-19 22:11:37 +01:00
Keisuke Kuroyanagi
24b260de62 Set input method mode for CascadingMenuPopup.
Set INPUT_METHOD_NOT_NEEDED not to steal input focus.

Bug: 28638654
Change-Id: Ic5070b309de459914d2670bd20a9af568438a843
2016-05-19 13:23:51 -07:00
Sergio Giro
882c7d244c Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c
am: 3eb0680642

* commit '3eb06806429f444fe87b894308681e20e6871c7d':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia3c21577450bc028548e8427a4a0f9f552e4890f
2016-05-19 18:21:50 +00:00
Sergio Giro
14c9a306ad Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: I22e0d3b3967ad205e0e9aad328790e907335ed17
2016-05-19 18:10:04 +00:00
Sergio Giro
3eb0680642 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia20b312dfd8181fadd38f075817630a1c5ab518f
2016-05-19 18:09:30 +00:00