drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,040 Commits 1 Branch 0 Tags
Commit Graph

22842 Commits

Author SHA1 Message Date
Christoph Studer
685720309a Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev 2014-10-28 12:41:33 +00:00
Lorenzo Colitti
8a140ccfe3 am 9d6f408a: am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev automerge: 35261c4 
* commit '9d6f408ab5a3fc12a1cae2ffba928c79df74739c':
  Change removeStackedLink to take an interface name.
 2014-10-28 08:55:55 +00:00
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
Jason Monk
e88b0e76f9 am 48d7a89c: Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e automerge: e585740 automerge: 8ae1a5e 
* commit '48d7a89c2c04871a4740fb444059a07e58a1bb06':
  Add missing passive discovery flag
 2014-10-28 07:17:33 +00:00
Yuncheol Heo
17de67e7c0 am 9a3e7578: Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev automerge: 571cc6b automerge: 522e0af 
* commit '9a3e75783ea36d54b808fbbca0cf44dd8f93a815':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
 2014-10-28 07:17:25 +00:00
Jeff Sharkey
4b67bd101a am a7a3479a: Merge "Check upgrade certs before permissions." into lmp-mr1-dev automerge: e795533 automerge: 05cff40 
* commit 'a7a3479a85a68175f4d35f8ee977ca6b3b5f618b':
  Check upgrade certs before permissions.
 2014-10-28 07:17:07 +00:00
Wale Ogunwale
72dbb9b374 am 7e003ba7: Merge "Added documentation for various window frame types." into lmp-mr1-dev automerge: 674f55e automerge: e1c6d89 
* commit '7e003ba7511b5d4a5722b08c02760ad79bb1f42c':
  Added documentation for various window frame types.
 2014-10-28 07:16:55 +00:00
Jeff Sharkey
4e61168681 am 720147e2: Merge "Follow API removal." into lmp-mr1-dev automerge: d634d39 automerge: 19022f6 
* commit '720147e2490d895608c7b61a7d8a5e262c371178':
  Follow API removal.
 2014-10-28 07:16:46 +00:00
Jeff Sharkey
eb0baea9a0 am a38592ae: Merge "Follow ArraySet refactoring." into lmp-mr1-dev automerge: 9c81373 automerge: 817722b 
* commit 'a38592ae5d0cd6ed6d2a8c105d4d26475d4b7a07':
  Follow ArraySet refactoring.
 2014-10-28 07:16:38 +00:00
Jeff Sharkey
6007da7b73 am a148a0dc: Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 automerge: a5921b9 
* commit 'a148a0dc667ac35599a35a46f2232f0128269d78':
  Drop DEV network stats to save RAM.
 2014-10-28 07:16:34 +00:00
Jeff Sharkey
23801ccafb am 1c665948: am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev automerge: 301b563 
* commit '1c6659486c7f9a868aaf1c87d08ffd9aa3f750d7':
  Reduce PackageManager RAM usage: ArrayMap/Set.
 2014-10-28 07:16:25 +00:00
Jeff Hao
7caa514807 am 2b8a1b38: am e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev automerge: ad1a613 
* commit '2b8a1b38ecca250a57358675c3a08d7640925fb5':
  Get UsageStats if no PackageUsage is available for boot dexopt filtering.
 2014-10-28 07:16:18 +00:00
Wink Saville
831296e84f am ae85478d: am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev automerge: e5b4c12 
* commit 'ae85478d3dbed145825293c307bde4213ff175f3':
  Change subId to int from long
 2014-10-28 07:16:13 +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
Craig Mautner
fa3515bd0d Do not go through a layout if visibility is GONE 
An unnecessary layout based on dimensions changing catches up
with us later when the next layout doesn't occur.

In this case
we layed out the Settings panel because visibility changed from
visible to GONE and the requested width/height didn't match the
current window width height. When the visibility changed back
to visible the dimensions matched and another layout was not
performed.

This fix delays the layout until the window becomes visible again.

Fixes bug 17681754.

Change-Id: I0a3ff9479dca93e78c5d3a3df40faceffc10ecbd
 2014-10-27 14:46:27 -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
Nicolas Prevot
ea72c08c14 Schedule to write package restrictions. 
In PackageManagerService, for prefered activities,
persistent preferred activities and cross-profile intent filters:
schedule a write to package restrictions instead of writing the file directly.

Also, do not write all settings when writing package restrictions is enough.

BUG: 17996284

Change-Id: Ic732954f8a66d3aa1f0ca85a10fba290b14e68f4
 2014-10-27 13:17:52 +00:00
Christoph Studer
1382e67e1c NoMan: Add update bit to notification_enqueue log 
Log whether an enqueued notification updated a previously present
notification.

Bug: 18083122
Change-Id: Ie6ed69f0bf53c668701b44e33282ca74b509a7e3
 2014-10-27 13:29:43 +01: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
3be2d19b97 am f47b7c42: am 2c3f6616: am 5b820a8a: Fix build 
* commit 'f47b7c42cb23751d8ece8c5d244acfed43474b0d':
  Fix build
 2014-10-27 04:32:24 +00:00
Wonsik Kim
f47b7c42cb am 2c3f6616: am 5b820a8a: Fix build 
* commit '2c3f661678e0f047033b4e78ee74f643e1a1fcc4':
  Fix build
 2014-10-27 03:00:10 +00:00
Wonsik Kim
2eef7ef099 am bae8d7e6: am 03bdbca2: am 470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev 
* commit 'bae8d7e64afedc973ff27881e37779810d24e48c':
  TIF: change input state based on the number of available streams
 2014-10-27 02:10:00 +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