Commit Graph

65262 Commits

Author SHA1 Message Date
Lorenzo Colitti
35ffc550dd Merge "Merge "When dumping connectivity metrics events, print data as well." into nyc-dev am: e4860f0 am: 8711593" into nyc-mr1-dev-plus-aosp
am: 05b4399

* commit '05b4399242ae4759143c7ca3bd72565c1bbee74e':
  When dumping connectivity metrics events, print data as well.

Change-Id: I094e96703fba00a24ce90670b3966ebc9f5e392d
2016-04-26 03:58:41 +00:00
Lorenzo Colitti
87115932c5 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev
am: e4860f0

* commit 'e4860f02564e887918192f733a29f04552f83414':
  When dumping connectivity metrics events, print data as well.

Change-Id: I63c0b56f9f54e0df794b3061e310c702f638b857
2016-04-26 03:28:34 +00:00
Lorenzo Colitti
e4860f0256 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev 2016-04-26 03:22:26 +00:00
Jeff Sharkey
bee17df836 Merge "Track down Contexts without data directories." into nyc-dev am: 3a10c1e am: 3bf4cd1
am: 47e625c

* commit '47e625c64c811d8a373784e0172b2eb8ed60c70a':
  Track down Contexts without data directories.

Change-Id: I2897b5a85ca276b28fe2eb4c02ea679cb2344317
2016-04-25 23:34:35 +00:00
Alex Light
2f46f70798 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev am: 57413a7 am: 7ad3001
am: 6534e16

* commit '6534e16cf73005baaf9ed7c537b030ca1c67aa9f':
  Make fake libart for misbehaving apps be loaded.

Change-Id: If20e1dad4170e0b9cf007a5bcd7420762deb0664
2016-04-25 23:04:11 +00:00
Jeff Sharkey
3bf4cd1fb5 Merge "Track down Contexts without data directories." into nyc-dev
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
  Track down Contexts without data directories.

Change-Id: Id6934369489b8a60e8d6ceb3de8f7774c5128ed6
2016-04-25 22:57:37 +00:00
Jeff Sharkey
596e8588b1 resolve merge conflicts of d1153a3 to master
Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267
2016-04-25 16:40:38 -06:00
Alex Light
7ad3001399 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
am: 57413a7

* commit '57413a74777060d9368f89966e9abcf96e33af8e':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Iba15cda4cda9968dbe303919427ad192bb940f46
2016-04-25 22:04:53 +00:00
Jeff Sharkey
3a10c1e86d Merge "Track down Contexts without data directories." into nyc-dev 2016-04-25 21:59:41 +00:00
Jeff Sharkey
5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
2016-04-25 15:53:50 -06:00
TreeHugger Robot
57413a7477 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev 2016-04-25 21:53:31 +00:00
Jeff Sharkey
79014856cc resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp
Change-Id: I65f892594034c6de4ac17459c01e146fe4c4e377
2016-04-25 15:52:11 -06:00
Kweku Adams
78502626ae Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev am: 3cabb2a am: 6c0291c
am: 5a3350b

* commit '5a3350b65c95ecb4c3252c07f1d6450dbd6a3071':
  Removing extraneous field from batterystats dumpsys.

Change-Id: Ied21cfa884915e8008bd32add81f38cf4baf26e5
2016-04-25 21:50:55 +00:00
Dan Sandler
0551b0f42a resolve merge conflicts of c635525 to master
Change-Id: I33b31ce36bbf255408ac50b87ed29f3957c9d533
2016-04-25 17:32:50 -04:00
Kweku Adams
6c0291c144 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev
am: 3cabb2a

* commit '3cabb2a6b3ae1c120a56cc4c2eaf2ba853cb3e32':
  Removing extraneous field from batterystats dumpsys.

Change-Id: I8568d44fb0af02b8096fd48c832d424ef4d41aee
2016-04-25 20:46:08 +00:00
Jeff Sharkey
c79a568f18 Merge "API changes for DownloadManager and JobScheduler." into nyc-dev 2016-04-25 20:14:59 +00:00
Kweku Adams
3cabb2a6b3 Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev 2016-04-25 20:09:41 +00:00
Dan Sandler
5bab149bce Merge changes from topic \'substitute-notification-app-name\' into nyc-dev
am: 955009f

* commit '955009f9d384d1b19ebb441814ca0a3fac0fbc47':
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.

Change-Id: I709f92bda6edd41abd8b22bbee2d4c887cb8dc1c
2016-04-25 19:34:48 +00:00
Daniel Sandler
955009f9d3 Merge changes from topic 'substitute-notification-app-name' into nyc-dev
* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.
2016-04-25 19:22:40 +00:00
Jeff Sharkey
24492ae448 Track down Contexts without data directories.
Data directories for all packages should be created and managed by
installd; if we create a Context and the data directory doesn't exist
yet, we're in trouble, since a later mkdirs() would end up creating
the directory with incorrect permissions, mode, and SELinux labels.

Bug: 28272737
Change-Id: Ie3bb884ab07748719378de5c792046a031a3f945
2016-04-25 13:20:29 -06:00
Bo Liu
8a68ab45a5 Merge "WebView doc: explain persist js across navigations" into nyc-dev am: b698fc9 am: d61776e
am: c144e2b

* commit 'c144e2b599c262d327d74c0d7f1a8e929097f508':
  WebView doc: explain persist js across navigations

Change-Id: I44d0cd7fa79454ddd31c4f394696534d0e735bbb
2016-04-25 18:57:13 +00:00
TreeHugger Robot
c144e2b599 Merge "WebView doc: explain persist js across navigations" into nyc-dev am: b698fc9
am: d61776e

* commit 'd61776e18e7497571e94d640945c224cc5e4fc71':
  WebView doc: explain persist js across navigations

Change-Id: I51ff498cc69cd6a88df14cd425f80f062a5edffd
2016-04-25 18:51:56 +00:00
Bo Liu
0374048e2d Merge "WebView doc: explain persist js across navigations" into nyc-dev
am: b698fc9

* commit 'b698fc9d84cff493ce34dd9860f14f34ce48e8f0':
  WebView doc: explain persist js across navigations

Change-Id: I87b81e624c7fc44ad316dc287d8a7332312860af
2016-04-25 18:46:51 +00:00
TreeHugger Robot
b698fc9d84 Merge "WebView doc: explain persist js across navigations" into nyc-dev 2016-04-25 18:39:47 +00:00
Kweku Adams
5b2747e133 Removing extraneous field from batterystats dumpsys.
Accidentally introduced in ag/851920.

Change-Id: I89ac490cef1735defa7165e6d27beae20490091d
2016-04-25 10:44:05 -07:00
Calin Juravle
720898fd88 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc am: 3a61c96
am: 64804b7

* commit '64804b759156abf7f2979a8151020faff9d026dc':
  Disable StrictMode policy when setting up profile support

Change-Id: I239978da3183b412c01a98026a260daf50e6f84c
2016-04-25 17:37:29 +00:00
TreeHugger Robot
64804b7591 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dc
am: 3a61c96

* commit '3a61c96d29b5fed0fbb4d234c46589c4763b0e11':
  Disable StrictMode policy when setting up profile support

Change-Id: Ia35d5a8e5d4b86f1524c9dd69216123772ee761d
2016-04-25 17:26:40 +00:00
Calin Juravle
2797c1234a Merge "Disable StrictMode policy when setting up profile support" into nyc-dev
am: 096e2dc

* commit '096e2dcf855714577bb86eaa4869ff46b5980a07':
  Disable StrictMode policy when setting up profile support

Change-Id: I430da856430046c5e2751232b427505962615b33
2016-04-25 17:16:37 +00:00
Bo Liu
e29d313e95 WebView doc: explain persist js across navigations
BUG: 28207652
Change-Id: Ib33f029c2cae6c1482c0c951075275e9f96ae73c
2016-04-25 09:38:06 -07:00
TreeHugger Robot
096e2dcf85 Merge "Disable StrictMode policy when setting up profile support" into nyc-dev 2016-04-25 15:54:37 +00:00
Calin Juravle
430ef455d6 Disable StrictMode policy when setting up profile support
Bug: 28304158
Change-Id: Iedf8714bd4f3526823b3060b30e0f11c6c0abcea
2016-04-25 15:09:03 +01:00
Lorenzo Colitti
0a082e2c38 When dumping connectivity metrics events, print data as well.
Currently the output is not very interesting, looking like:

ConnectivityMetricsEvent(1461591945223, 4, 5): Bundle[mParcelledData.dataSize=340]
ConnectivityMetricsEvent(1461591945289, 0, 2048): android.net.metrics.NetworkEvent@b76cd61
ConnectivityMetricsEvent(1461591945296, 4, 5): Bundle[mParcelledData.dataSize=340]
ConnectivityMetricsEvent(1461591945299, 0, 3072): android.net.metrics.DefaultNetworkEvent@e2f3086
ConnectivityMetricsEvent(1461591945527, 0, 2051): android.net.metrics.ValidationProbeEvent@884ad47

but at least it's better than nothing, and event logger users can
always implement a better toString method on their events.

This is only enabled if --events is passed into the dump.

Bug: 28204408
Change-Id: Ife96b8d54e5e91317d86b622d5efc29724969f63
2016-04-25 22:55:09 +09:00
Ricky Wai
75374dbbd5 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 4ace836 am: e4c8276
am: c6002d0

* commit 'c6002d0819a23f25dfc7fc87916d5fd82a7c4a67':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I2170df9c34e825783dd6bfd472b7243422b2a71c
2016-04-25 13:30:32 +00:00
Ricky Wai
e4c827662a Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am: 4ace836

* commit '4ace8366619d04d326505ad689c5d43707f2aaea':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I2b6fe365bf3556d9fba5ac3c2c7580ded28dc644
2016-04-25 13:20:37 +00:00
Ricky Wai
4ace836661 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev 2016-04-25 13:11:46 +00:00
Rubin Xu
af1ad873fc Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev am: 0c9c09c am: b3e7163
am: d584076

* commit 'd584076940d1d70e0c76a179e05acd833e141451':
  Regenerate ApplicationInfo if package suspend state is changed.

Change-Id: I8c7bcb654790a1afb275cb8f7d3f56ebbb0bc465
2016-04-25 10:29:00 +00:00
Ricky Wai
7881cf8f81 Make "work mode on dialog" show personal challenge in unified work lock
Bug: 28183335
Change-Id: Ib212b283b9561f88899f6e7ea130944391b6e558
2016-04-25 10:26:14 +00:00
Rubin Xu
b3e71637e7 Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev
am: 0c9c09c

* commit '0c9c09ccff72c9a017e6c7da3aef8738eea5f176':
  Regenerate ApplicationInfo if package suspend state is changed.

Change-Id: I4d519180d99f4d1cbac35d0167e99217da4da9f8
2016-04-25 10:19:10 +00:00
Rubin Xu
0c9c09ccff Merge "Regenerate ApplicationInfo if package suspend state is changed." into nyc-dev 2016-04-25 10:12:02 +00:00
Tobias Thierer
8eb2e9d6e5 Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp am: cc0eaf4
am: 334a936

* commit '334a936e154fd18a301f7df860322e456ec0486e':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I626df98f9cea04e782e837e6ddf0d37690306b70
2016-04-25 10:04:05 +00:00
Clara Bayarri
14066c8ae9 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev am: f48f390 am: dea459c
am: d3cd71b

* commit 'd3cd71b8a9c781921f6e4efe9685284bf1f4c6df':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: Ia0b104bc5e689aa168bf4e7414ec82ff000c040d
2016-04-25 09:49:27 +00:00
Tobias Thierer
b0800dce4a Avoid instantiations of Boolean that are immediately unboxed.
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).

Also fixed a couple of other valueOf()s in SyncStorageEngine.

Bug: 28289401
(cherry-picked from commit ca01820735)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
2016-04-25 10:47:02 +01:00
Clara Bayarri
dea459c750 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
am: f48f390

* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
  Improve KeyboardShortcutInfo documentation for Modifiers

Change-Id: I36a85346b9b5a8606b75cf670ddbc67ab9831377
2016-04-25 09:39:35 +00:00
Clara Bayarri
f48f390a60 Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev 2016-04-25 09:31:06 +00:00
Seigo Nonaka
39abb7cf51 Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e am: 33ed899
am: b900d9f

* commit 'b900d9f77c30c92ee446c9abde81f2b0f4303f64':
  Fix unexpected truncation again.

Change-Id: I7fd698ce618c43745184883137772b776bc6166d
2016-04-25 03:52:15 +00:00
Seigo Nonaka
b900d9f77c Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e
am: 33ed899

* commit '33ed8993e93b6c8cf0b595a5cd49fedc8c468cba':
  Fix unexpected truncation again.

Change-Id: Ie27f994a7714074ddb8e3013fee648ef7a98db18
2016-04-25 03:47:23 +00:00
Seigo Nonaka
cb5abde896 Merge "Fix unexpected truncation again." into nyc-dev
am: ab8913e

* commit 'ab8913e364d296fdb62e6b2572d102063bff42cb':
  Fix unexpected truncation again.

Change-Id: I62bd788fccf05f4ca4c8ef5879576d48fd083086
2016-04-25 03:42:38 +00:00
Seigo Nonaka
ab8913e364 Merge "Fix unexpected truncation again." into nyc-dev 2016-04-25 03:36:30 +00:00
Jeff Sharkey
f07c7b9fd0 API changes for DownloadManager and JobScheduler.
To support moving DownloadManager, add new JobScheduler network type
constraint that matches "any network except roaming."  Also add an
API to get a specific JobInfo by ID.

Since the default network can be different on a per-app basis, and
individual apps may be blocked due to app standby, evaluate job
connectivity constraints on a per-UID basis.  To implement this
cleanly, add NetworkInfo.isMetered() to match the isRoaming() API.

Add new DownloadManager APIs to support charging and device idle
constraints, which are plumbed through to JobScheduler under the
hood when scheduled.

Add filtering to JobScheduler dumpsys to omit noisy details for
packages the caller isn't interested in.

Bug: 28098882, 26571724, 19821935
Change-Id: I09ca7184ef7ce6adba399f579d415a5fb2ea6110
2016-04-24 14:39:34 -06:00
Selim Cinek
791e3f85c3 Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be7 am: 21b28f2
am: 9ea6705

* commit '9ea6705d5b0dcd57a6849f26b7582b859999dff3':
  Fixed the paddings in inbox style to match the rest of the templates

Change-Id: Ic2fd4ca7b66a18aec74fd51b36a44cadbd2af85d
2016-04-24 15:00:18 +00:00