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

217447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
0e6007d229 Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 
am: fe482e0bca

* commit 'fe482e0bcabb98d983ecb4080b35490b9814c809':
  Initialize DisplayContent base info when object is constructed
 2015-11-13 17:20:05 +00:00
Filip Gruszczynski
fe482e0bca Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 2015-11-13 17:15:14 +00:00
Mark Salyzyn
5f6b645985 Merge "jni: is loggable speedup, not within signal" am: 96e780c99c 
am: 33a0db92aa

* commit '33a0db92aaf1f50cefaab0215b59e7e513f55d32':
  jni: is loggable speedup, not within signal
 2015-11-13 15:29:35 +00:00
Mark Salyzyn
33a0db92aa Merge "jni: is loggable speedup, not within signal" 
am: 96e780c99c

* commit '96e780c99c46e805989b7f1d6486cef96c7d2c27':
  jni: is loggable speedup, not within signal
 2015-11-13 15:22:05 +00:00
Mark Salyzyn
96e780c99c Merge "jni: is loggable speedup, not within signal" 2015-11-13 15:16:48 +00:00
Diego Perez
6777f54fa4 Fix delegation of methods within inner static classes 
Currently, delegation of inner static classes methods is broken since
the rewritten method tries to pass an instance to the outer class. This
updates the method generation to only pass the reference if the inner
class is not static.

Change-Id: I8493929cafdbd80968989b422af0f956fa65681a
 2015-11-13 14:06:50 +00:00
Wale Ogunwale
4ff84631af Initialize DisplayContent base info when object is constructed 
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.

Bug: 22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
 2015-11-12 20:46:07 -08:00
Shreyas Basarge
69c1bf1de0 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 
am: 9752605815

* commit '9752605815ee8956e855c468d341e9f18031c53e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:55:08 +00:00
Shreyas Basarge
9752605815 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 
am: d80d24f5b1

* commit 'd80d24f5b13c16ce19369b1debb9137516f59e3f':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:48:52 +00:00
Shreyas Basarge
d80d24f5b1 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:55 +00:00
Shreyas Basarge
6bdb49f9f7 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:52 +00:00
Matthew Williams
0d9b625236 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5 
am: 7336557937

* commit '73365579374d1460aca6abd05dbbc2e1417dee6f':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:35:52 +00:00
Shreyas Basarge
c4a9c319e5 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b 
am: c9eb8b4367

* commit 'c9eb8b436715ba9b59382759cf0dcf991ed33594':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:35:51 +00:00
Matthew Williams
7336557937 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 
am: ffffcf14c5

* commit 'ffffcf14c58f9795bda802d75308332d0bb49dfe':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:29:50 +00:00
Shreyas Basarge
c9eb8b4367 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d 
am: 64bdb9f06b

* commit '64bdb9f06b7fc3e497088243a966dec95d1936e1':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:29:47 +00:00
Matthew Williams
4565f8743a Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c 
am: 69ee300c90

* commit '69ee300c90288fba6c3f81a37fd347892009e42e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:43 +00:00
Shreyas Basarge
64bdb9f06b Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e 
am: 359ee7f47d

* commit '359ee7f47de2eee82951abed294e4db44405973c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:40 +00:00
Matthew Williams
ffffcf14c5 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c 
am: 69ee300c90

* commit '69ee300c90288fba6c3f81a37fd347892009e42e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:37 +00:00
Shreyas Basarge
359ee7f47d Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 
am: bf29f10c1e

* commit 'bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:16:24 +00:00
Matthew Williams
69ee300c90 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc 
am: af5c9f809c

* commit 'af5c9f809cf7bbb890036a6411504a92e0d507ca':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:16:19 +00:00
Shreyas Basarge
bf29f10c1e Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af 
am: 44368e6dd4

* commit '44368e6dd4ec56e9eca47b1e81d307f672bb3006':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:09:36 +00:00
Matthew Williams
af5c9f809c Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 
am: c455148edc

* commit 'c455148edce05b4862df8853a78276fb5f28151a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:09:35 +00:00
Shreyas Basarge
44368e6dd4 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 
am: f5f03a19af

* commit 'f5f03a19affc6775ac3e44a3540351e132fffc0e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Matthew Williams
c455148edc Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f 
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Shreyas Basarge
f5f03a19af Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 
am: cc7c1d3812

* commit 'cc7c1d381249edfd906cb57afbd8589e6c345141':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:34 +00:00
Matthew Williams
6d13650c74 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f Sync extras bundle comparison can throw NPE am: c0f39c1ece 
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812 Sync extras bundle comparison can throw NPE am: 2f137b7705 
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:02 +00:00
Matthew Williams
34b700a7c2 Sync extras bundle comparison can throw NPE 
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Shreyas Basarge
294611faa8 Sync extras bundle comparison can throw NPE 
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Michal Piechowski
43b0a458ab Don't use timestamps with all zero 
Although all zero (0000:00:00) is valid time, in most cases it means
that value is not present. According to http://www.exiv2.org/Exif2-2.PDF
in such case those values should be omitted, however
some cameras set them to 0 anyway. With this commit such timestamps
will be treated as they were empty.

Change-Id: I9c762b1fa04ea6bf9c0fba9e2459a20430c71c90
 2015-11-13 10:05:06 +09:00
Sanket Padawe
c9d033a71a Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 am: 4f822bbf2a 
am: 761af3d27d

* commit '761af3d27d40488d46a35a0c0c421a81fdd46cc4':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-13 00:17:13 +00:00
Casey Dahlin
2c19dbeff5 Merge "Add hidden support for arrays of raw file descriptors" am: 376d5f350c 
am: 7a38be6112

* commit '7a38be61124fb1d75ed73cdd4050ba25047d2b03':
  Add hidden support for arrays of raw file descriptors
 2015-11-13 00:07:48 +00:00
Sanket Padawe
761af3d27d Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 
am: 4f822bbf2a

* commit '4f822bbf2a1c44c9dc5668857aa8cf7f0e5969cc':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-13 00:07:47 +00:00
Sanket Padawe
4f822bbf2a Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev 
am: 5b6ad87630

* commit '5b6ad87630756751471f7224672328d955c8f2fb':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-12 23:58:48 +00:00
Sanket Padawe
4a0839d008 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev 
am: 5b6ad87630

* commit '5b6ad87630756751471f7224672328d955c8f2fb':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-12 23:58:46 +00:00
Casey Dahlin
7a38be6112 Merge "Add hidden support for arrays of raw file descriptors" 
am: 376d5f350c

* commit '376d5f350c6618d915338a9927b5d0f5fb61eba8':
  Add hidden support for arrays of raw file descriptors
 2015-11-12 23:57:58 +00:00
Sanket Padawe
ccbe7383e6 Don't allow contact sharing by default for device not recognized as carkit. 
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.

Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
(cherry picked from commit 07533dbffff5551ad4c58852b5856f57d7da6801)
 2015-11-12 23:53:42 +00:00
Sanket Padawe
5b6ad87630 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev 2015-11-12 23:53:25 +00:00
Casey Dahlin
376d5f350c Merge "Add hidden support for arrays of raw file descriptors" 2015-11-12 23:50:05 +00:00
Mark Salyzyn
c954fde0b6 jni: is loggable speedup, not within signal 
Speedup by telling __android_is_loggable interface it will not
be called within a signal handler. This saves two system calls.

Bug: 25563384
Change-Id: Ib8188641c8c76e5aa848476da98596be6b8e5040
 2015-11-12 15:40:51 -08:00
Joe LaPenna
76e30f26af Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am: 516ac154e1 -s ours 
am: 4d93d122bd  -s ours

* commit '4d93d122bd8c9988cb4239d5aec7401f6ee3c54b':
  DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
 2015-11-12 23:22:32 +00:00
Joe LaPenna
ddf77e14e5 Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am: 6915d809e8 -s ours 
am: 2d43dd3c0e  -s ours

* commit '2d43dd3c0e49776589cb21bfbf9b3860623d0bfc':
  DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
 2015-11-12 23:21:09 +00:00
Joe LaPenna
4d93d122bd Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev 
am: 516ac154e1  -s ours

* commit '516ac154e16324d178fc1343293c4b1d5447ef2c':
  DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
 2015-11-12 23:14:29 +00:00
Joe LaPenna
2d43dd3c0e Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev 
am: 6915d809e8  -s ours

* commit '6915d809e895d29411c0a687bff7fdd391509dc7':
  DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
 2015-11-12 23:13:01 +00:00
Joe LaPenna
516ac154e1 Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev 2015-11-12 23:08:48 +00:00
Joe LaPenna
6915d809e8 Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev 2015-11-12 23:08:42 +00:00
Deepanshu Gupta
e0c9dd1b4f Improve error reporting on Exceptions in fw views. 
am: d30c141a2d

* commit 'd30c141a2dee881fd83e1415a50161def1acf227':
  Improve error reporting on Exceptions in fw views.
 2015-11-12 22:36:00 +00:00
Casey Dahlin
2f974b252f Add hidden support for arrays of raw file descriptors 
Change-Id: I4013e0700369764a26485d8620ebf16d8bea1951
Test: Built and ran Android in an emulator
Bug: 25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-11-12 14:13:15 -08:00
Deepanshu Gupta
d30c141a2d Improve error reporting on Exceptions in fw views. 
When there's an exception during the inflation of a framework view (for
example invalid attributes), report the exception correctly. The earlier
behaviour assumed the exception to be a ClassNotFoundException and tried
to load it from the user's project. This is not longer the case.

Also, update the MockView class to a FrameLayout with a single TextView.
This means that the MockView is a ViewGroup and will not choke when
someone attempts to add a View to it (although, the view will be
silently dropped).

Change-Id: Ice003817ceb627ebfbbbb245ab6be10f9141e728
 2015-11-12 13:56:14 -08:00