21611 Commits

Author SHA1 Message Date
Lorenzo Colitti
9d6f408ab5 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
automerge: 35261c4

* commit '35261c4351ea42b2bbd057e852f50158de8eda9c':
  Change removeStackedLink to take an interface name.
2014-10-28 08:50:41 +00:00
Lorenzo Colitti
111cc9f511 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +00:00
Lorenzo Colitti
f3cab63ef2 Change removeStackedLink to take an interface name.
This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
2014-10-28 15:13:57 +09:00
Jason Monk
48d7a89c2c Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e automerge: e585740
automerge: 8ae1a5e

* commit '8ae1a5e10efdb58b83b510337dddd47759bdc650':
  Add missing passive discovery flag
2014-10-28 03:41:57 +00:00
Yuncheol Heo
9a3e75783e Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev automerge: 571cc6b
automerge: 522e0af

* commit '522e0afa0fc400ceeee034c1b593b73a2787f659':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
2014-10-28 03:40:16 +00:00
Jason Monk
e58574026b Add missing passive discovery flag automerge: 4444c5b
automerge: 07faf0e

* commit '07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
  Add missing passive discovery flag
2014-10-28 02:21:20 +00:00
Yuncheol Heo
571cc6b195 Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev 2014-10-28 01:04:07 +00:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
2014-10-28 00:52:56 +00:00
Jeff Sharkey
a7a3479a85 Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533
automerge: 05cff40

* commit '05cff4047d1c1d0552ce52a6af0151c6b1cc8e4f':
  Check upgrade certs before permissions.
2014-10-28 00:36:08 +00:00
Wale Ogunwale
7e003ba751 Merge "Added documentation for various window frame types." into lmp-mr1-dev automerge: 674f55e
automerge: e1c6d89

* commit 'e1c6d898177bb694ad84ccb1940f3e3df074a290':
  Added documentation for various window frame types.
2014-10-28 00:33:30 +00:00
Jeff Sharkey
720147e249 Merge "Follow API removal." into lmp-mr1-dev automerge: d634d39
automerge: 19022f6

* commit '19022f6991e2d681dfdc8d5e6464557647a1faa1':
  Follow API removal.
2014-10-28 00:31:14 +00:00
Jeff Sharkey
a38592ae5d Merge "Follow ArraySet refactoring." into lmp-mr1-dev automerge: 9c81373
automerge: 817722b

* commit '817722bb36e81ef0216fd1c75a9174e08238f954':
  Follow ArraySet refactoring.
2014-10-28 00:29:03 +00:00
Jeff Sharkey
a148a0dc66 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527
automerge: a5921b9

* commit 'a5921b9b79a1d95e8a41bd74998cab82b153cb0a':
  Drop DEV network stats to save RAM.
2014-10-28 00:27:07 +00:00
Jeff Sharkey
e79553355b Merge "Check upgrade certs before permissions." into lmp-mr1-dev 2014-10-27 23:35:58 +00:00
Jason Monk
4444c5b278 Add missing passive discovery flag
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
2014-10-27 19:25:50 -04:00
Wale Ogunwale
674f55e515 Merge "Added documentation for various window frame types." into lmp-mr1-dev 2014-10-27 23:05:39 +00:00
Jeff Sharkey
c28bd3532b Check upgrade certs before permissions.
We're now checking for permission redefinition early during the
install process, which can result in a confusing error message when
the real problem is a mis-signed app.  So do a quick signature
sanity check before checking permissions.

Bug: 18095637
Change-Id: I9a9b48da9c5dc7fb9bde6f3f338ea08e53b6b705
2014-10-27 15:38:27 -07:00
Jeff Sharkey
d634d39c60 Merge "Follow API removal." into lmp-mr1-dev 2014-10-27 22:01:58 +00:00
Jeff Sharkey
cff1d67339 Follow API removal.
Bug: 18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792
2014-10-27 14:53:40 -07:00
Jeff Sharkey
1c6659486c am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
automerge: 301b563

* commit '301b563107c7458a21e4460254e81694b45f0e35':
  Reduce PackageManager RAM usage: ArrayMap/Set.
2014-10-27 21:33:55 +00:00
Jeff Hao
2b8a1b38ec am e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev
automerge: ad1a613

* commit 'ad1a613c5291af54df0a26cf5c34434079782692':
  Get UsageStats if no PackageUsage is available for boot dexopt filtering.
2014-10-27 21:31:54 +00:00
Wink Saville
ae85478d3d am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
automerge: e5b4c12

* commit 'e5b4c1219a32a086508d83101c10605dd894e4d2':
  Change subId to int from long
2014-10-27 21:30:48 +00:00
Jeff Sharkey
9c81373bc9 Merge "Follow ArraySet refactoring." into lmp-mr1-dev 2014-10-27 21:02:08 +00:00
Jeff Sharkey
036ebd782c Follow ArraySet refactoring.
Bug: 18115729
Change-Id: I2c32965b621b5bb57ff3bde02b00b31b59a5cd6d
2014-10-27 13:51:23 -07:00
Jeff Sharkey
49c1527cd5 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev 2014-10-27 20:38:06 +00:00
Jeff Sharkey
e67b8d2829 Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 2014-10-27 19:57:00 +00:00
Jeff Hao
e8d9810cde Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev 2014-10-27 17:46:23 +00:00
Wink Saville
4dec130c39 Merge "Change subId to int from long" into lmp-mr1-dev 2014-10-27 17:34:47 +00:00
Yuncheol Heo
8ecb7219df CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
- Some TV doesn't ask the menu status actively, so we'll send it
  together when sending <ActiveSource>.

Bug: 18109775
Change-Id: I4f7378bb9feaa11d9c9e5a2f6633e19cd41a5fc5
2014-10-27 17:35:17 +09:00
Wonsik Kim
f47b7c42cb am 2c3f6616: am 5b820a8a: Fix build
* commit '2c3f661678e0f047033b4e78ee74f643e1a1fcc4':
  Fix build
2014-10-27 03:00:10 +00:00
Wonsik Kim
5b820a8aa1 Fix build
Bug: 17648994
Change-Id: I35e1c89c707c4e9809cc3e4b6cf5b57dae898ba0
2014-10-27 11:02:10 +09:00
Wonsik Kim
bae8d7e64a am 03bdbca2: am 470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev
* commit '03bdbca2a9582691063585ce5fca11e6a33bdfaf':
  TIF: change input state based on the number of available streams
2014-10-27 02:01:13 +00:00
Wonsik Kim
470b77b8cf Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 2014-10-27 00:59:44 +00:00
Paul Lawrence
60302f1938 am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30
automerge: 31deee5

* commit '31deee5e307c00245d0fc7fd09dfe299145e1e0c':
  Stop crypto UI from crashing during encryption
2014-10-24 21:30:13 +00:00
Paul Lawrence
e20dd304b7 am c220d8e5: Stop crypto UI from crashing during encryption
automerge: 0e6178b

* commit '0e6178b81eb5a09253acbb6e28ee863ffbf8a5a5':
  Stop crypto UI from crashing during encryption
2014-10-24 20:56:22 +00:00
Jeff Sharkey
5274dcc85d Drop DEV network stats to save RAM.
We migrated to pure XT stats a long time ago, so we no longer need
to keep the DEV stats cached in RAM.  This saves ~250KB on a typical
device.

Bug: 18118003
Change-Id: I3d84ba47073fa3500454784afc956c8e53404492
2014-10-24 13:15:15 -07:00
Paul Lawrence
0e6178b81e am c220d8e5: Stop crypto UI from crashing during encryption
* commit 'c220d8e57ca97c70db1fd72f040bd6c6f70bbf13':
  Stop crypto UI from crashing during encryption
2014-10-24 20:08:33 +00:00
Jeff Sharkey
9f837a99d4 Reduce PackageManager RAM usage: ArrayMap/Set.
Transition PackageManager internals away from heavier HashMap/HashSet
to use drop-in ArrayMap/ArraySet replacements.  Saves ~38% RAM and
thousands of objects on a typical device.

Bug: 18115729
Change-Id: Ie107d2fee4b7baa4e3c3923231b4be877d1a5d2f
2014-10-24 12:26:45 -07:00
Paul Lawrence
c220d8e57c Stop crypto UI from crashing during encryption
Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
2014-10-24 10:37:40 -07:00
Jason Monk
b22d1002d1 am 730409c3: am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev
* commit '730409c332e19c34f7c309fbe054532eec88bdbc':
  Make lock task check if focused better
2014-10-24 15:20:55 +00:00
Jason Monk
013d14f887 Merge "Make lock task check if focused better" into lmp-mr1-dev 2014-10-24 15:09:39 +00:00
Christoph Studer
c4f03e9fcf am 8b417054: am 55abbfa0: Merge "NoMan: Log canceled notifications" into lmp-mr1-dev
* commit '8b4170547ee118b0b7f8fae2cbba1b799f91d2b4':
  NoMan: Log canceled notifications
2014-10-24 15:03:13 +00:00
Christoph Studer
7ffa8dad6f am c10f39d5: am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
* commit 'c10f39d536aebbdd7d6b30ac2dfcfcf6b51772f8':
  SysUI/NoMan: Log clicks on notification buttons
2014-10-24 14:38:25 +00:00
Christoph Studer
81e5b5f2f8 NoMan: Log canceled notifications
In addition to logging cancelation command, also log actually
canceled notifications via the new eventlog tag notification_canceled.

Bug: 18083122
Change-Id: I1e3e1e1368f39519f34c002ae374f318f647a401
2014-10-24 16:34:54 +02:00
Christoph Studer
5c1a49651b Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev 2014-10-24 14:29:20 +00:00
Jason Monk
5560615871 am 467f9efe: am 104d2484: Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
* commit '467f9efe897cccc5deec5ee62fc33133fabe10e1':
  Show screen pinning toasts on all users
2014-10-24 14:04:45 +00:00
Jason Monk
104d2484ec Merge "Show screen pinning toasts on all users" into lmp-mr1-dev 2014-10-24 13:55:55 +00:00
Adrian Roos
621823e064 am 53f30ec2: am bcd07652: Add API for querying trusted state
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
  Add API for querying trusted state
2014-10-24 13:27:39 +00:00
Adrian Roos
bcd076525c Add API for querying trusted state
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
2014-10-24 13:59:45 +02:00
Yuncheol Heo
b10d25fc96 am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev
* commit 'ddb863f42832e5dcc0f5167ce5ba7ecea2d977a4':
  CEC: Fix apilint errors.
2014-10-24 10:39:50 +00:00