Commit Graph

6458 Commits

Author SHA1 Message Date
Ruchi Kandoi
558159a578 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 am: b60d0a438a
am: 3bba531ee4

* commit '3bba531ee475be6749553ae884e9bedf63c8e52b':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: Ied6e9a7a24d84f7c8b8264b4e4819b449cd30a2e
2016-05-14 01:41:49 +00:00
Ruchi Kandoi
3bba531ee4 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37
am: b60d0a438a

* commit 'b60d0a438a66b78ed0714a0182d6e84426fb0d88':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I6a6957d530bab235b751a93271d1ae711ffa9c01
2016-05-14 01:39:16 +00:00
Ruchi Kandoi
b60d0a438a Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev
am: 2512ec9e37

* commit '2512ec9e376b0fce213f6d635dfb991c79041031':
  network: Adds the functionality to parse uid in netlink messages.

Change-Id: I899110108f1200dbc687732963e85083ec5504e0
2016-05-14 01:36:48 +00:00
Ruchi Kandoi
2512ec9e37 Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev 2016-05-14 01:32:54 +00:00
Ruchi Kandoi
fa97fcf7b9 network: Adds the functionality to parse uid in netlink messages.
Netlink notifications about the state of the modem contains uid too.
This patch adds the functionality to add that. It also fixes the bug to
parse the timestamp in the message even in cases where the length is
greater than expected.

Bug: 28527904
Change-Id: I4643bff3eb5b1ffa2dc0b78f1c6947d60487e0d8
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-05-13 15:36:23 -07:00
Adam Powell
0fdf7c326a Merge "Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706 am: a53d9cace1" into nyc-mr1-dev-plus-aosp
am: 60c73947d0

* commit '60c73947d087c8272889d7b8a600b59d391cd98c':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: Id1db07816cc5437b4099123b663e32736283c327
2016-05-13 17:23:25 +00:00
Adam Powell
15021f66fa Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev am: e89dc40706
am: a53d9cace1

* commit 'a53d9cace1ff124e23ae54dbb68c9a58947a8ce1':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I13c4f6c28551188cf2622a7769b4a11cb67b47bc
2016-05-13 17:20:37 +00:00
Adam Powell
ac3f24fabd Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I178045e372dd962383fbc6d26fe7b99b20f6cf88
2016-05-13 17:17:48 +00:00
Adam Powell
a53d9cace1 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I254e8d1a0b3cc45e3c030ca1cec7e7ecc5dbd91e
2016-05-13 17:17:44 +00:00
TreeHugger Robot
e89dc40706 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev 2016-05-13 17:11:14 +00:00
Adam Powell
86100d18ad Show package icon/label for resolved package-targeted implicit intents
If we're going to show metadata about a resolved implicit intent that
is targeted to a single package with multiple potential targets,
populate the ResolveInfo with the label and icon of the target
package's ApplicationInfo and set resolvePackageName. This helps use
cases such as EXTRA_INITIAL_INTENTS in ChooserActivity, where
sometimes apps set target packages but not components.

Bug 28739056

Change-Id: I8070d341fccc139463c5ac8d66db45fce02252e5
2016-05-13 08:34:37 -07:00
Philip Cuadra
396da016ed Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df am: 5fcabe19a7
am: d49592805f

* commit 'd49592805f91ccd1e79027845d95c382bc59a5da':
  Pinner service for pinning files into memory

Change-Id: I936e8146d9f60dafd5e202a7bc4b1bc2a42ddb38
2016-05-12 22:10:26 +00:00
Philip Cuadra
d49592805f Merge "Pinner service for pinning files into memory" into nyc-dev am: b41088b4df
am: 5fcabe19a7

* commit '5fcabe19a76a06d25358e9889323353f72a94547':
  Pinner service for pinning files into memory

Change-Id: Ia7dc78c32f2beb9c16bf15ac41defc63e51be0e1
2016-05-12 22:07:43 +00:00
Philip Cuadra
5fcabe19a7 Merge "Pinner service for pinning files into memory" into nyc-dev
am: b41088b4df

* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
  Pinner service for pinning files into memory

Change-Id: I404f6844fb5bf4a097d3d862a9294cb58484d176
2016-05-12 22:04:36 +00:00
Philip Cuadra
0513394f85 Merge "Pinner service for pinning files into memory" into nyc-dev
am: b41088b4df

* commit 'b41088b4dfa8b077541cd3be69c51bd4bba4e938':
  Pinner service for pinning files into memory

Change-Id: I6dc3f40dbbb5e327976f665de1451eb1d416ee2a
2016-05-12 22:04:26 +00:00
Philip Cuadra
b41088b4df Merge "Pinner service for pinning files into memory" into nyc-dev 2016-05-12 21:55:29 +00:00
Philip Cuadra
7bd0fdd639 Pinner service for pinning files into memory
Pin key files into memory to prevent having to fetch from flash
after boot.  Improves system performance by preventing page cache
thrash.  Retrieves files from a device-specific overlay to allow
specialization.

bug 28251566

Change-Id: I8532f52bd70271794dd7576976d13a524849ce7b
2016-05-12 13:12:20 -07:00
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +00:00
Jorim Jaggi
ad94d9ac26 Merge "Fix smallest width configuration calculation" into nyc-dev am: 63c09fd6cd
am: 3381482586

* commit '33814825861305032d930a95905b67c6120725b5':
  Fix smallest width configuration calculation

Change-Id: I5a380ded44ab27443c67660bb94ce4dcf47e0a17
2016-05-12 02:04:55 +00:00
Jorim Jaggi
3381482586 Merge "Fix smallest width configuration calculation" into nyc-dev
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Id753dcb396d31c8bb250581889fb190e396ecf6d
2016-05-12 01:55:14 +00:00
Jorim Jaggi
1e35919a09 Merge "Fix smallest width configuration calculation" into nyc-dev
am: 63c09fd6cd

* commit '63c09fd6cd5db31180c3db119d097fb3c5a0e505':
  Fix smallest width configuration calculation

Change-Id: Iaca06abab9336d15fab5b2ec302a7a821e8f0103
2016-05-12 01:55:13 +00:00
Jorim Jaggi
63c09fd6cd Merge "Fix smallest width configuration calculation" into nyc-dev 2016-05-12 01:50:05 +00:00
Jorim Jaggi
8563943bd3 Fix smallest width configuration calculation
For calculating the smallest width, we need to iterate through all possible
orientations, snap the task bounds to a valid snap target and then use the
smallest width across all orientations.

In addition to that, when flinging the divider handle to the bottom of the
screen, we need to pass in fullscreen task bounds to avoid that this new
logic applies so the maximizing app only receives one configuration change.

Change-Id: I37aa9a40938517dfaf26770eb41327d76aec7c62
Fixes: 28469673
2016-05-11 18:33:01 -07:00
Dianne Hackborn
398216dc9c Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: b3edcd78d2
am: fc101121f2

* commit 'fc101121f23c292277cb8a54c35c07c4d98de67d':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Ic0d46a17246d9882675c992b81d068be88cd5f74
2016-05-12 01:00:06 +00:00
Aurimas Liutikas
9daaf21eb5 Merge "Stop saving ActionMenuItemView state." into nyc-dev am: b9bb8e88c6
am: 69abd9bac2

* commit '69abd9bac2c3f2c6743cea86b0f6aa953485f7de':
  Stop saving ActionMenuItemView state.

Change-Id: Id84fbd964fdd9d89f52346c436ea418b689df2e8
2016-05-12 00:59:28 +00:00
Dianne Hackborn
fc101121f2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev
am: b3edcd78d2

* commit 'b3edcd78d25372a2a1e7520b63da1d5d38fbe59f':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: I1eda5e59bdd122dd35a8025b35b63b216ca9e60d
2016-05-12 00:50:42 +00:00
Dianne Hackborn
9f073e94e0 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev
am: b3edcd78d2

* commit 'b3edcd78d25372a2a1e7520b63da1d5d38fbe59f':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Iabd4b29208f3a26e78d4773033a7653738dc471d
2016-05-12 00:50:34 +00:00
Dianne Hackborn
b3edcd78d2 Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev 2016-05-12 00:40:18 +00:00
Aurimas Liutikas
69abd9bac2 Merge "Stop saving ActionMenuItemView state." into nyc-dev
am: b9bb8e88c6

* commit 'b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
  Stop saving ActionMenuItemView state.

Change-Id: Ic8ee0f6d55cae78dd6da72ea8ea269b1ad735753
2016-05-12 00:39:19 +00:00
Aurimas Liutikas
462c3ba3ef Merge "Stop saving ActionMenuItemView state." into nyc-dev
am: b9bb8e88c6

* commit 'b9bb8e88c66a80ca43e5aabad94348fdaf0fef1d':
  Stop saving ActionMenuItemView state.

Change-Id: If218724b1a04381934e7591381e15ad262095a7d
2016-05-12 00:38:53 +00:00
Aurimas Liutikas
9c661a40c1 Stop saving ActionMenuItemView state.
There is no useful state to be saved for these views.
This fixes a crash where we try to restore the state of an
ActionView (that shares the same ID as ActionMenuItemView).

Framework version of ag/1020805

Bug: 28110832
Change-Id: I4a09786a1c08bef1765fd8be3affb21dce296272
2016-05-11 14:46:47 -07:00
Dianne Hackborn
ef0a402f58 Fix issue #28400000: Settings memory UI still showing z-ram...
...but probably shouldn't.

Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.

Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a
2016-05-11 14:21:07 -07:00
Clara Bayarri
9b4ccde88d Fix crash in ResolverActivity
am: 9550f5dfa6

* commit '9550f5dfa607b1c464c2673186ee26e4b12a79d6':
  Fix crash in ResolverActivity

Change-Id: I57b593f67937556ea6268be0a43bcd8fe6da6e68
2016-05-11 15:08:05 +00:00
Clara Bayarri
9550f5dfa6 Fix crash in ResolverActivity
Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
(cherry picked from commit b53b2bd088)
2016-05-11 14:57:37 +00:00
Clara Bayarri
b53b2bd088 Fix crash in ResolverActivity
Bug: 28540294
Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885
2016-05-11 11:20:13 +01:00
Jeff Sharkey
f506350414 Merge "Fail upgrades that change storage devices." into nyc-dev am: 1fdeb5bdf7 am: bd92d3c267
am: d7fe2a02be

* commit 'd7fe2a02be5fd9b280d4612e8042a6994bf90013':
  Fail upgrades that change storage devices.

Change-Id: Ia2fa24453a913d6cf9bca5fcd639973b67325ef9
2016-05-11 01:12:59 +00:00
Jeff Sharkey
d7fe2a02be Merge "Fail upgrades that change storage devices." into nyc-dev am: 1fdeb5bdf7
am: bd92d3c267

* commit 'bd92d3c26722e4a435e1c46364cddb27a222df7d':
  Fail upgrades that change storage devices.

Change-Id: Id9e9becd2a18bdeff760fd1b940465388f906d1c
2016-05-11 01:10:07 +00:00
Jeff Sharkey
ae32884c48 Merge "Fail upgrades that change storage devices." into nyc-dev
am: 1fdeb5bdf7

* commit '1fdeb5bdf7530eef212b414860569202eb5a68fa':
  Fail upgrades that change storage devices.

Change-Id: I8f0a6ee997552743ee26a965e91809a737e6f0ff
2016-05-11 01:07:23 +00:00
Jeff Sharkey
bd92d3c267 Merge "Fail upgrades that change storage devices." into nyc-dev
am: 1fdeb5bdf7

* commit '1fdeb5bdf7530eef212b414860569202eb5a68fa':
  Fail upgrades that change storage devices.

Change-Id: I88868123f5122c039a9aea19b6fdd9ecae089972
2016-05-11 01:07:22 +00:00
Clara Bayarri
b44ddbb5b3 Merge "Add Tron logging for open/close App Disambig" into nyc-mr1-dev
am: f4f15d582a

* commit 'f4f15d582a60b9324e4b1e4f3276f4cc4b2b0531':
  Add Tron logging for open/close App Disambig

Change-Id: I77ba68bc54cfa0a6b382adce4f1605196a07aab4
2016-05-10 23:53:13 +00:00
Jeff Sharkey
2d3709246e Fail upgrades that change storage devices.
Now that we live in an FBE world, we need the user to be involved
with every package move to ensure that CE storage is unlocked.  This
means that a package upgrade session that would require moving an
app between storage devices cannot be satisfied.

Bug: 27147501
Change-Id: I274d85cbed727d9185178b77bfc6cef196df17f5
2016-05-10 17:01:51 -06:00
Clara Bayarri
fa902aaa61 Add Tron logging for open/close App Disambig
This change adds
- Open/close the disambig shade with a featured app
- Open/close the disambig shade with no featured app
- User selected "Always" for the featured app
- User selected "Just Once" for the featured app
- User chose a non-featured app

Bug: 26108706
Change-Id: I4d2c99cee1a784aa1cab156939c57c83d35a4aa5
2016-05-10 15:15:29 -07:00
Chris Craik
da45222e0a Merge "Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf am: fa050d6355" into nyc-mr1-dev-plus-aosp
am: 5686771d31

* commit '5686771d31b88379b6b58c572e9c39f11a48fa46':
  Fix status bar background flicker

Change-Id: I87a4eacafcc9c7178d95844c8b7e5675bc1d5ecb
2016-05-06 02:01:42 +00:00
Chris Craik
555271d3ae Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf
am: fa050d6355

* commit 'fa050d635590328fc787fb14d964585a5641461f':
  Fix status bar background flicker

Change-Id: Ia8f181646bbd1943fb7a8e04cc9571a56a5051f7
2016-05-06 01:59:05 +00:00
Chris Craik
d482c7703a Merge "Fix status bar background flicker" into nyc-dev
am: d0fa4d3aaf

* commit 'd0fa4d3aafa42da696c006ab96a11ed54deec14c':
  Fix status bar background flicker

Change-Id: Ifee7d5aaa5ffb9fe7c7c822eb9805c4c71d36fc0
2016-05-06 01:57:00 +00:00
TreeHugger Robot
d0fa4d3aaf Merge "Fix status bar background flicker" into nyc-dev 2016-05-06 01:49:34 +00:00
Chris Craik
867b812eff Fix status bar background flicker
Fixes: 28533578

Change-Id: I075f49b7d20e0e95e790a9755d104a0a51575054
2016-05-05 16:22:21 -07:00
Yohei Yukawa
7a7f7412cf Merge "Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev am: 9f76abc8ab am: 94c9aadc99" into nyc-mr1-dev-plus-aosp
am: 20fce5ed58

* commit '20fce5ed585ae0200927b50122366fd0196c565f':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: I4f1a8071c8cb2c02cb6f8a6ef614363ae73682c3
2016-05-05 22:12:30 +00:00
Dianne Hackborn
906bf903b4 Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev am: d90be6cccc am: 9071cacdbe
am: 9b560795e2

* commit '9b560795e292a9701848e0b0603c7edc68b8bc1d':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: If3d2f01c1e0aacdcf7ef44eeef46ea84dbfb3b32
2016-05-05 22:12:08 +00:00
Yohei Yukawa
94c9aadc99 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev
am: 9f76abc8ab

* commit '9f76abc8ab9db3306c8061e9719dbe2a998031f3':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: If27212387cd76bb6cc7f1cd1d844bd3ca07915e8
2016-05-05 22:02:30 +00:00