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

293275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
be3c30fe68 Merge "LOCAL_CLANG := true is now the default" 2016-10-18 05:10:29 +00:00
TreeHugger Robot
4a648f03c9 Merge "Fixed typo on service name." 2016-10-18 02:22:44 +00:00
George Burgess IV
11ca129c2b Merge "Fix static analyzer warnings." am: ff5c3ad08b am: 1db1a86bba 
am: e76253055c

Change-Id: I37be36a86dbab762c64696843916e88f17908251
 2016-10-18 01:56:57 +00:00
George Burgess IV
e76253055c Merge "Fix static analyzer warnings." am: ff5c3ad08b 
am: 1db1a86bba

Change-Id: Iafed2ab4df7297ed8e3b0b86cafe15af3e1c8823
 2016-10-18 01:49:53 +00:00
George Burgess IV
1db1a86bba Merge "Fix static analyzer warnings." 
am: ff5c3ad08b

Change-Id: I655fd765cfeae407c070261cfe07ce8b739b06fa
 2016-10-18 01:43:24 +00:00
Treehugger Robot
ff5c3ad08b Merge "Fix static analyzer warnings." 2016-10-18 01:30:55 +00:00
Jerry Zhang
ee18f66977 Merge changes from topics 'usb_bugfixes', 'usb_bugfixes2' 
* changes:
  Revert: Remove the kick from config switches in UsbDeviceManager
  Clean up persistent usb state on boot.
 2016-10-18 01:00:09 +00:00
TreeHugger Robot
860297b91a Merge "Clean up use of DisplayContent from WindowState." 2016-10-18 00:50:32 +00:00
Jerry Zhang
2d2346e094 Revert: Remove the kick from config switches in UsbDeviceManager 
Test: Manual
Bug: 32197840
Change-Id: Id2e939a57e170fbb4c06e55dc79c5d35ce95486f
 2016-10-17 17:41:36 -07:00
Jerry Zhang
a45dac0e83 Clean up persistent usb state on boot. 
b/31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.

Bug: 31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
 2016-10-17 17:41:36 -07:00
TreeHugger Robot
047f5a7b4f Merge "Fix race with Asset destruction and printing allocation stats" 2016-10-18 00:25:00 +00:00
TreeHugger Robot
92b3f5aed7 Merge "force appropriate size" 2016-10-17 23:45:27 +00:00
Michael Kwan
869c283d53 Merge "Fix oversized icons and removed title line limit." into cw-f-dev am: ff2d91fa07 
am: 63b3085570

Change-Id: Id4e4d9e57c24280fe968006893910c273d9f556f
 2016-10-17 23:31:03 +00:00
Michael Kwan
8721dbb98c Fix oversized icons and removed title line limit. am: e6c38677a4 
am: 5079a82337

Change-Id: I5730a6a022a8c07a9b3d378c1b5fbd5f0a345db5
 2016-10-17 23:30:15 +00:00
Philip P. Moltmann
8e9652a208 Merge "Clarify which props of USB devices are optional" 2016-10-17 23:27:14 +00:00
Michael Kwan
63b3085570 Merge "Fix oversized icons and removed title line limit." into cw-f-dev 
am: ff2d91fa07

Change-Id: If711cf676853dd470fdd1eec2cadbe8a8033df1d
 2016-10-17 23:23:46 +00:00
Michael Kwan
5079a82337 Fix oversized icons and removed title line limit. 
am: e6c38677a4

Change-Id: Ic97878c26ec49ee4632becfaffcb23d6d329e41e
 2016-10-17 23:23:40 +00:00
Michael Kwan
ff2d91fa07 Merge "Fix oversized icons and removed title line limit." into cw-f-dev 2016-10-17 23:14:06 +00:00
Chris Thornton
87cf29314d Merge "Update primary key in VIS sound model database." into nyc-mr1-dev am: c81e1f15d2 am: c6577b1266 
am: 5fa6750da2

Change-Id: Iae01991869a25ef66ac5c0a7a7aa578d101f7117
 2016-10-17 22:52:09 +00:00
Chris Thornton
a761493245 Update primary key in VIS sound model database. am: 5bd5cf75e1 am: 2d452d7dab 
am: 059b78c949

Change-Id: I309ac36fee77039f786ea72830c9da74cd87dfa9
 2016-10-17 22:51:11 +00:00
Chris Thornton
5fa6750da2 Merge "Update primary key in VIS sound model database." into nyc-mr1-dev am: c81e1f15d2 
am: c6577b1266

Change-Id: I8ce1dfc713ec15be5b2d9814667a5c04ea4d6780
 2016-10-17 22:45:35 +00:00
Chris Thornton
059b78c949 Update primary key in VIS sound model database. am: 5bd5cf75e1 
am: 2d452d7dab

Change-Id: I53e9f73caee56f715bdeaf93a680598bc13aee01
 2016-10-17 22:44:38 +00:00
Wale Ogunwale
b0f3b836b9 Clean up use of DisplayContent from WindowState. 
Follow up to ag/1483993 where WindowTokens can now only be on one display.
Clean-up some existing code that dealt with having WindowTokens on
multiple displays.

Test: Existing tests pass.
Change-Id: Ie908eda37bc44097dea773b0fc163d35cc9baf35
 2016-10-17 15:36:50 -07:00
Chris Thornton
c6577b1266 Merge "Update primary key in VIS sound model database." into nyc-mr1-dev 
am: c81e1f15d2

Change-Id: I1a04106f1fc4748b015a18920bfc73ec3aed97fd
 2016-10-17 22:32:20 +00:00
Chris Thornton
2d452d7dab Update primary key in VIS sound model database. 
am: 5bd5cf75e1

Change-Id: Ie35e4a4f15ece95d3b5458f4c5ee06098062c96f
 2016-10-17 22:32:17 +00:00
Mikhail Naganov
c7555a0871 Merge "Split audio effects headers" 2016-10-17 22:22:52 +00:00
TreeHugger Robot
c81e1f15d2 Merge "Update primary key in VIS sound model database." into nyc-mr1-dev 2016-10-17 22:20:38 +00:00
TreeHugger Robot
52528d7629 Merge "Fix complex clipping on mergeable ops" 2016-10-17 22:11:46 +00:00
Todd Kennedy
9caf94e535 force appropriate size 
during install, the user could specify an invalid size [ie. a negative
number].

also error out if we're given a path that's not a file.

Change-Id: I79e9ef82723495782146208eb5469722d1f8ed02
Test: manually ran 'adb install' with invalid arguments
 2016-10-17 14:50:52 -07:00
Sanket Agarwal
e60cb323a1 Merge "Remove APIs that are not directly usable." am: 9cff57312d am: 086be31642 
am: 933c625a92

Change-Id: I973390be918acec70733942c84e11700a9df71b1
 2016-10-17 21:40:38 +00:00
Mark Salyzyn
21c2e9e60c Merge "missing includes" am: 78929f3ee0 am: 6a8f0d70b0 
am: 6e60ab12e7

Change-Id: I1b5c6f49d2ae565ebd59c6ce8d590512ab306487
 2016-10-17 21:38:33 +00:00
Sanket Agarwal
933c625a92 Merge "Remove APIs that are not directly usable." am: 9cff57312d 
am: 086be31642

Change-Id: I5f95fe50d16b26601405816625f4aa45f2ef6647
 2016-10-17 21:32:21 +00:00
Mark Salyzyn
6e60ab12e7 Merge "missing includes" am: 78929f3ee0 
am: 6a8f0d70b0

Change-Id: I40ff974f4333aaa714a63d5436b822491b9d78d6
 2016-10-17 21:31:35 +00:00
Sanket Agarwal
086be31642 Merge "Remove APIs that are not directly usable." 
am: 9cff57312d

Change-Id: I1234db97ed82017ed3bca02e10818a53fdc33d3d
 2016-10-17 21:28:05 +00:00
Mark Salyzyn
6a8f0d70b0 Merge "missing includes" 
am: 78929f3ee0

Change-Id: I3e7a25ded484d516fab453abe434c2e53cf0f27e
 2016-10-17 21:25:59 +00:00
Treehugger Robot
9cff57312d Merge "Remove APIs that are not directly usable." 2016-10-17 21:16:22 +00:00
Treehugger Robot
78929f3ee0 Merge "missing includes" 2016-10-17 21:12:08 +00:00
Adam Lesinski
0358efe4f7 Fix race with Asset destruction and printing allocation stats 
A race could occur when printing the list of Asset allocations for
debugging purposes.

Each Asset object would insert themselves into a global linked list
on construction and remove themselves on destruction. Iterating the list
and the insertion/remove operations all acquire a global lock.

The race occurs after the Asset subclass destructor runs but before the Asset
base class destructor runs, which performs the actual removal from the list.

The vtable of the object being destroyed ends up pointing at the base Asset class'
vtable, and during the iteration of the global list, a pure virtual method is called
leading to an abort, since the wrong vtable is dereferenced.

This change moves the insertion/removal of the Asset object into the global list
to the concrete class, which adds some maintenance overhead but solves the problem.

Bug:31113965
Test: make libandroidfw_tests
Change-Id: I1a620897e5e04a8519ee247883bba0719b1fa6f3
 2016-10-17 14:04:09 -07:00
Matthew Bouyack
4ede0e9b59 Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev am: 2cfae5a656 
am: 2d65e23741  -s ours

Change-Id: If872ccb461168d37034900eae7ee16c0882c2771
 2016-10-17 20:46:26 +00:00
Matthew Bouyack
a846a8b6fa DO NOT MERGE Improved anti-aliasing for circular display mask am: c84731ae3b 
am: 2c3c928ad9  -s ours

Change-Id: I96a652a5ca3f1372cfa94d07d1973d5e9fc689cb
 2016-10-17 20:45:33 +00:00
Chris Craik
f8f56cbb20 Fix complex clipping on mergeable ops 
Fixes: 32106003
Test: unit tests passing (and one added)

Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59
 2016-10-17 13:40:32 -07:00
Matthew Bouyack
2d65e23741 Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev 
am: 2cfae5a656

Change-Id: I50ece1dc71401855af31e7f4d7e13a469bf31c9f
 2016-10-17 20:38:42 +00:00
Matthew Bouyack
2c3c928ad9 DO NOT MERGE Improved anti-aliasing for circular display mask 
am: c84731ae3b

Change-Id: I64484d947636fc5b4ed43e13a3dc096ac1bb6fe1
 2016-10-17 20:38:34 +00:00
Matthew Bouyack
2cfae5a656 Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev 2016-10-17 20:28:55 +00:00
TreeHugger Robot
0f7e4a6623 Merge "Properly close USB device connection in Mtp device" 2016-10-17 20:10:19 +00:00
Android Build Merger (Role)
40251d1da8 Merge "Fix complex clipping on mergeable ops DO NOT MERGE am: d183e0b988 am: a6bfd8d12c am: dfe4a1b6ee -s ours" 2016-10-17 20:07:21 +00:00
TreeHugger Robot
0a8e926cda Merge "The bigger update to Canvas" 2016-10-17 20:06:30 +00:00
Chris Craik
0c3ba90ace Fix complex clipping on mergeable ops DO NOT MERGE am: d183e0b988 am: a6bfd8d12c 
am: dfe4a1b6ee  -s ours

Change-Id: I315eecdf35c37ea88ba084420343acdb44af0f71
 2016-10-17 20:06:12 +00:00
Chris Craik
dfe4a1b6ee Fix complex clipping on mergeable ops DO NOT MERGE am: d183e0b988 
am: a6bfd8d12c

Change-Id: I5af8d0fac1e47e7bf831ca2f387fe550acf4165c
 2016-10-17 19:59:32 +00:00
Chris Craik
a6bfd8d12c Fix complex clipping on mergeable ops DO NOT MERGE 
am: d183e0b988

Change-Id: Icb357a11cb8a4be473aa8b0acdb4d799973ff54a
 2016-10-17 19:52:53 +00:00