Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
210,751 Commits 3 Branches 0 Tags
1ef20d6221b7d752e636653df7798f6f4fb5ff06
Commit Graph

210751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Casey Dahlin
1ef20d6221 am bad130ee: am 02bc5488: Merge "Remove RPC interface Type" 
* commit 'bad130eed378891b82250d90aaf207088b4362e2':
  Remove RPC interface Type
 2015-09-02 21:29:59 +00:00
Casey Dahlin
bad130eed3 am 02bc5488: Merge "Remove RPC interface Type" 
* commit '02bc5488c19dcae7f21c43c8f3a20138e01a04d9':
  Remove RPC interface Type
 2015-09-02 21:18:46 +00:00
Casey Dahlin
02bc5488c1 Merge "Remove RPC interface Type" 2015-09-02 21:01:33 +00:00
Casey Dahlin
ca4543cdba Remove RPC interface Type 
AIDL previously supported "rpc" and "flatten" types, which are not used
anywhere in the Android tree. This patch removes them, which significantly cuts
down code and complexity.

Bug: 23517584
Test: Rebuilt AOSP tree against new version
Change-Id: I6cf38d43c1ce109ffca987cc14520945aa22431f
Signed-off-by: Casey Dahlin <sadmac@google.com>
 2015-09-02 13:34:26 -07:00
Christopher Wiley
1ed4f0f108 am d494b8c0: am f37947cb: Merge "aidl: Don\'t link librt on Mac" 
* commit 'd494b8c0cfaeedfb560f09355254c5fe397242be':
  aidl: Don't link librt on Mac
 2015-09-02 16:43:08 +00:00
Christopher Wiley
d494b8c0cf am f37947cb: Merge "aidl: Don\'t link librt on Mac" 
* commit 'f37947cb1a452b81f7b25cf961763c2ec3db5632':
  aidl: Don't link librt on Mac
 2015-09-02 16:34:40 +00:00
Christopher Wiley
f37947cb1a Merge "aidl: Don't link librt on Mac" 2015-09-02 16:23:01 +00:00
Christopher Wiley
1ab54c12e3 aidl: Don't link librt on Mac 
This fixes unittest build on Mac.

Change-Id: I5180f647d1b5b41f99c4d0423aaec9d05fee6355
 2015-09-02 08:59:30 -07:00
Yasuhiro Matsuda
fcf9ab5ab3 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.
 2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
 2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00
Christopher Wiley
082fb1d8cb am 96343073: am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main" 
* commit '96343073d63c72afa75057129abea4f0d4f8c103':
  aidl: Stop using Bionic's test main
 2015-09-01 20:11:55 +00:00
Christopher Wiley
96343073d6 am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main" 
* commit 'dd80a6cf37799b41ae07c60137d312c5ea2db961':
  aidl: Stop using Bionic's test main
 2015-09-01 20:01:30 +00:00
Christopher Wiley
dd80a6cf37 Merge "aidl: Stop using Bionic's test main" 2015-09-01 19:46:21 +00:00
Christopher Wiley
1006bfe09d aidl: Stop using Bionic's test main 
This allows us to build unittests on Mac, where Bionic's test main
does not build.

Change-Id: I59c805d233498bb67575f2e5f7049341f70ce55c
 2015-09-01 12:40:15 -07:00
Christopher Wiley
59b41c6418 am c8e4af65: am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library" 
* commit 'c8e4af65af7990d45e5505ebedc832c0a8fe58aa':
  aidl: Separate aidl logic into its own static library
 2015-09-01 19:00:53 +00:00
Christopher Wiley
c8e4af65af am 722bf5c7: Merge "aidl: Separate aidl logic into its own static library" 
* commit '722bf5c7dec37265021c17d35b0b078776699f97':
  aidl: Separate aidl logic into its own static library
 2015-09-01 18:49:12 +00:00
Christopher Wiley
722bf5c7de Merge "aidl: Separate aidl logic into its own static library" 2015-09-01 18:34:32 +00:00
Christopher Wiley
f3d846d0bd am cf471647: am 267cb88f: Merge "Set up aidl for gtest" 
* commit 'cf4716473d5af3cd257b7e093c95c9b63b3b32c9':
  Set up aidl for gtest
 2015-09-01 18:31:11 +00:00
Christopher Wiley
cf4716473d am 267cb88f: Merge "Set up aidl for gtest" 
* commit '267cb88f4d4adb2cdddd9b29eb8fce7104507114':
  Set up aidl for gtest
 2015-09-01 18:20:19 +00:00
Christopher Wiley
a25d35106e aidl: Separate aidl logic into its own static library 
Compile aidl's logic into a static library that can be
linked against both the unittest binary and the executable. Validate
that this is working by writing a basic unittest against options
parsing.

Provide default values for Options struct members.  These were
previously taking on values according to the the bits in the memory
allocated to hold them for preprocessed inputs.

Bug: 23516947
Change-Id: Ib57cd7f473995f7851d788deac39f9c4d9018e8f
Test: compiles and unittests pass
 2015-09-01 11:15:31 -07:00
Christopher Wiley
267cb88f4d Merge "Set up aidl for gtest" 2015-09-01 18:11:41 +00:00
Nick Kralevich
1293b953c4 am 712205ba: am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '712205bac075dc59a1ccd79a860d553ba31402f0':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 16:51:19 +00:00
Christopher Wiley
5fa874a30b am 26627d70: am 4d6cb77a: Merge "Tighten up compiler flags for aidl" 
* commit '26627d7011e8fbd66f0cabac5c3cb2a66c133d08':
  Tighten up compiler flags for aidl
 2015-09-01 16:51:12 +00:00
Dan Willemsen
83533a235c am 13786e28: am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" 
* commit '13786e281e4d67b9e2ff549fee34ddb3e82e0325':
  Remove USE_MINGW, whitelist windows modules
 2015-09-01 16:51:05 +00:00
Christopher Wiley
135fdcc76c am a6d16725: am a73e0045: Merge "Revert "Tighten up compiler flags for aidl"" 
* commit 'a6d167256d37f2b182658bb2d8ac6ed3f6258cb8':
  Revert "Tighten up compiler flags for aidl"
 2015-09-01 16:50:59 +00:00
Christopher Wiley
f9d0740352 am f7ea7c7b: am 1643e97b: Merge "aidl: Pull main() into dedicated file" 
* commit 'f7ea7c7b26dd129895c59be3b241d3676556fc42':
  aidl: Pull main() into dedicated file
 2015-09-01 16:50:53 +00:00
Christopher Wiley
fead6f025b am 72b1324c: am 2b83384f: Merge "Tighten up compiler flags for aidl" 
* commit '72b1324cb31ff155d580f9de148c609922218f50':
  Tighten up compiler flags for aidl
 2015-09-01 16:50:46 +00:00
Nick Kralevich
712205bac0 am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '9d586927102b597845607ccc82661e350821de82':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 16:37:59 +00:00
Christopher Wiley
26627d7011 am 4d6cb77a: Merge "Tighten up compiler flags for aidl" 
* commit '4d6cb77ad92c9acadb5afc5d80be38dd3b63c3fa':
  Tighten up compiler flags for aidl
 2015-09-01 16:37:31 +00:00
Dan Willemsen
13786e281e am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" 
* commit '60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
  Remove USE_MINGW, whitelist windows modules
 2015-09-01 16:37:10 +00:00
Christopher Wiley
a6d167256d am a73e0045: Merge "Revert "Tighten up compiler flags for aidl"" 
* commit 'a73e004516bae61bebe1e308f5b3ee295c1050b2':
  Revert "Tighten up compiler flags for aidl"
 2015-09-01 16:37:00 +00:00
Christopher Wiley
f7ea7c7b26 am 1643e97b: Merge "aidl: Pull main() into dedicated file" 
* commit '1643e97b330d6c0f47e8643e52b12c6887a89f81':
  aidl: Pull main() into dedicated file
 2015-09-01 16:36:52 +00:00
Christopher Wiley
72b1324cb3 am 2b83384f: Merge "Tighten up compiler flags for aidl" 
* commit '2b83384f44ffa30d1d3d61ded9ac4f83a275b77d':
  Tighten up compiler flags for aidl
 2015-09-01 16:36:37 +00:00
Nick Kralevich
9d58692710 Merge "Automatically assign default seinfo labels using the string "default"." 2015-09-01 13:39:10 +00:00
Robert Craig
5e16bc5a14 Automatically assign default seinfo labels using the string "default". 
default seinfo values are those for which policy lacks a
matching stanza in the corresponding mac_permissions.xml
file. Prior to this change the null object reference was
used to represent the non-matching state. This is in
contrast to a policy supplied default stanza which will
assign a non null seinfo value. Confused yet?

Basically, two default states were distinguished in the
code to describe the two cases where either a policy stanza
spelled out the base case seinfo label or not. Policy
writers could either supply a default stanza or rely on
the class instantiated value assigned by the ApplicationInfo
object. The hope was that the later assignment could be
used to help distinguish the cases where policy writers
intentionally white listed apps. This change will just use
the hard coded "default" string implicitly to describe all
cases and removes the idea of a policy supplied default stanza.

Change-Id: Ib7b01ee004775f24db9a69340a31784b967ce030
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2015-09-01 05:51:04 -04:00
Zhentao Sun
eaed83137c am 0a247995: am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev 
* commit '0a247995d79149b891ab6fad5dc0a1cb584d111c':
  Don't launch the camera if it already in foreground.
 2015-09-01 01:05:45 +00:00
Jorim Jaggi
53c5dadbb8 am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets 
* commit 'd302508d2838000b1dde05d9bfaf5e5181dcf9dc':
  Add a private API to get notified about lockout resets
 2015-09-01 01:05:39 +00:00
Zhentao Sun
0a247995d7 am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev 
* commit 'aa06c8089a7d417a240004e785239f00ba1af0ec':
  Don't launch the camera if it already in foreground.
 2015-09-01 00:58:38 +00:00
Jorim Jaggi
d302508d28 am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets 
* commit '4a306fd744bc2f6f434cb7032580b063b704a9c5':
  Add a private API to get notified about lockout resets
 2015-09-01 00:58:31 +00:00
Zhentao Sun
aa06c8089a am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev 
* commit '363c694a448d90322936526d78a9878de0003d0e':
  Don't launch the camera if it already in foreground.
 2015-09-01 00:47:04 +00:00
Jorim Jaggi
4a306fd744 am 3a464785: Add a private API to get notified about lockout resets 
* commit '3a464785088e7fd206666f640912729533948ce8':
  Add a private API to get notified about lockout resets
 2015-09-01 00:47:00 +00:00
Christopher Ferris
7dd51792e2 am d6597cb4: am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 
* commit 'd6597cb43c1985ec955f2f5c5daf7be52a9f12a2':
  Save/restore errno in SIGCHLD handler.
 2015-09-01 00:41:06 +00:00
Zhentao Sun
363c694a44 Merge "Don't launch the camera if it already in foreground." into mnc-dr-dev 2015-09-01 00:40:39 +00:00
Jorim Jaggi
3a46478508 Add a private API to get notified about lockout resets 
SystemUI uses it to start authentication again after lockout reset
expired.

Bug: 22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
 2015-09-01 00:37:54 +00:00
Christopher Ferris
d6597cb43c am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 
* commit '1bc7d0c84a1fbd27add883b8e000096677a1ca22':
  Save/restore errno in SIGCHLD handler.
 2015-09-01 00:31:30 +00:00
Christopher Ferris
1bc7d0c84a am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 
* commit '70c958c414204b195d4195cdcafe33932087e6b1':
  Save/restore errno in SIGCHLD handler.
 2015-09-01 00:23:02 +00:00
Christopher Ferris
70c958c414 Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 2015-09-01 00:14:16 +00:00
Christopher Ferris
a8a795428a Save/restore errno in SIGCHLD handler. 
The SIGCHLD handler can set the errno, which can change the errno found
on the thread on which the signal handler is invoked. Most of the time
this is harmless, but it's possible that if the main thread was making
a system call, and allows certain failures based on errno, that logic
can fail. The fix is to save/restore errno in the handler.

Bug: 23572286
Bug: 23689391
Change-Id: I4542fd60cc1398ce0a8902d8df98a3d089fb6efe
 2015-08-31 16:36:14 -07:00
Todd Kennedy
dde3fd6585 am f7bf24ad: am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev 
* commit 'f7bf24ad1d780b326287409f37e0e8c03115f60d':
  Ensure host is set before onInflate()
 2015-08-31 23:14:54 +00:00