Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
185,090 Commits 3 Branches 0 Tags
d2e1dc138cbc748e4c76e6edb0c3271ba3d53a17
Commit Graph

50068 Commits

Author SHA1 Message Date
Adam Lesinski
9c329b8b64 Merge "Only attempt to load .apk files in AssetManager" 2015-03-16 22:16:04 +00:00
Adam Lesinski
1dd50c54b5 Only attempt to load .apk files in AssetManager 
This will reduce the number of files we must open
and reduce log spam.

Change-Id: I595ba4a5ea8466e530915d6ae4cf1d3e3dba15ef
 2015-03-16 15:10:56 -07:00
Dianne Hackborn
a501a021c3 Merge "Add new voice request for picking from a list." 2015-03-16 22:01:51 +00:00
Andreas Gampe
2851d7d0fd am 7f95a1bc: am 5eb42122: Merge "Frameworks/base: Force long computation" 
* commit '7f95a1bc3271318d7f08f19426be24b17186f9f0':
  Frameworks/base: Force long computation
 2015-03-16 21:58:39 +00:00
Tor Norbye
da81fa569e Merge "Add resource type annotations to some APIs" 2015-03-16 21:20:31 +00:00
Andreas Gampe
7f95a1bc32 am 5eb42122: Merge "Frameworks/base: Force long computation" 
* commit '5eb421221bcade4f5715d42843346f7d3c733547':
  Frameworks/base: Force long computation
 2015-03-16 20:49:12 +00:00
Andreas Gampe
5eb421221b Merge "Frameworks/base: Force long computation" 2015-03-16 20:37:02 +00:00
Eric Laurent
aff57b7519 Merge "broadcast radio API" 2015-03-16 18:30:23 +00:00
Dianne Hackborn
3d07c94c39 Add new voice request for picking from a list. 
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).

And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.

Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
 2015-03-16 11:29:12 -07:00
Andreas Gampe
872d191e61 am 8af305f1: am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor"" 
* commit '8af305f17ff0d4b84e5a71777de788e9a6ae2780':
  Revert "Frameworks/base: Fix a constructor"
 2015-03-16 18:11:47 +00:00
Andreas Gampe
8af305f17f am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor"" 
* commit '6878ee57b438b063fcc09a19a04fba92e113c1d2':
  Revert "Frameworks/base: Fix a constructor"
 2015-03-16 18:03:17 +00:00
Andreas Gampe
6878ee57b4 Merge "Revert "Frameworks/base: Fix a constructor"" 2015-03-16 17:51:15 +00:00
Andreas Gampe
8c80efeaeb Revert "Frameworks/base: Fix a constructor" 
The constructor was public API, doh. Gotta do this differently.

This reverts commit 33c5b2a62f.

Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
 2015-03-16 17:51:01 +00:00
Andreas Gampe
ebb8922a5b am 19279ec0: am d61cbf9a: Merge "Frameworks/base: Fix a constructor" 
* commit '19279ec04845b2a47b90240c9d47bf8fb5ece464':
  Frameworks/base: Fix a constructor
 2015-03-16 17:13:26 +00:00
Andreas Gampe
19279ec048 am d61cbf9a: Merge "Frameworks/base: Fix a constructor" 
* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
  Frameworks/base: Fix a constructor
 2015-03-16 17:03:02 +00:00
Andreas Gampe
d61cbf9a08 Merge "Frameworks/base: Fix a constructor" 2015-03-16 16:51:01 +00:00
Andreas Gampe
1109006158 resolved conflicts for merge of 038b8462 to master 
Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554
 2015-03-16 09:45:34 -07:00
Andreas Gampe
038b846284 am 5abcd06b: Merge "Frameworks/base: Fix always-false equals" 
* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
  Frameworks/base: Fix always-false equals
 2015-03-16 15:43:37 +00:00
Andreas Gampe
5abcd06b1f Merge "Frameworks/base: Fix always-false equals" 2015-03-16 15:28:53 +00:00
John Reck
2c528c2175 am 059ba981: am 386dcbdd: Merge "Frameworks/base: Fix missing cast" 
* commit '059ba9814bb07aeebd8bf697fc05ff833c63033b':
  Frameworks/base: Fix missing cast
 2015-03-16 15:16:17 +00:00
John Reck
059ba9814b am 386dcbdd: Merge "Frameworks/base: Fix missing cast" 
* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
  Frameworks/base: Fix missing cast
 2015-03-16 15:09:04 +00:00
Robin Lee
ee1f24ff29 Merge "Recognise insecure encryption with a new constant" 2015-03-16 14:32:12 +00:00
Nicolas Prevot
8458e531bf Merge "Remove the owner userid of cross-profile intent filters." 2015-03-16 11:25:51 +00:00
Andreas Gampe
63662320ae Frameworks/base: Force long computation 
Ensure that an int-based computation is carried out as long.

Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
 2015-03-15 20:17:07 -07:00
Andreas Gampe
33c5b2a62f Frameworks/base: Fix a constructor 
This was meant to be a constructor, according to the comment.

Change-Id: Ief49011b392e58b37d9acb4a3f754f1828b256af
 2015-03-15 14:29:16 -07:00
Andreas Gampe
007cfa73b8 Frameworks/base: Fix always-false equals 
Rect != Insets.

Change-Id: I3d4ff890608e446b51f09a1b633af742f0c069d4
 2015-03-15 14:19:43 -07:00
Andreas Gampe
65ac8a2bd7 Frameworks/base: Fix missing cast 
Without a cast, the division is integer division.

Change-Id: I050e53778de8b1591a0be16ebbee8eed70eb1528
 2015-03-15 14:10:23 -07:00
Vinit Deshpande
4cd92835be Fixing build after merge from mirror-m-wireless-internal-release 
There have been few breaking changes

1. TelecomManager.getCallCapablePhoneAccounts is not hidden anymore
2. CAPABILITY_VIDEO_CALLING is not hidden anymore
3. mPhoneStateListener doesn't exist anymore, so it is commented out

Change-Id: I22221eda73a20c745e316d9d56f914ab17b83533
 2015-03-15 14:04:19 -07:00
Vinit Deshpande
02ce8d8f33 am "Helper methods for voicemail status provider." 
merged from goog/mirror-m-wireless-internal-release
8b97ee3 Helper methods for voicemail status provider.
 2015-03-15 13:44:07 -07:00
Vinit Deshpande
a4985a7952 am "Hide calllog entries for unregistered phone accounts" 
merged from goog/mirror-m-wireless-internal-release
2d2bc16 Hide calllog entries for unregistered phone accounts

Change-Id: I39b60b86fca9c1b74d750ab251cc26b3ce5f5650
 2015-03-15 13:43:11 -07:00
Vinit Deshpande
7b3f6a95a8 am "Add frameworks classes and methods necessary for VVM syncadapter structure." 
merged from goog/mirror-m-wireless-internal-release
7c07dfa Add frameworks classes and methods necessary for VVM syncadapter structure.
 2015-03-15 13:41:31 -07:00
Vinit Deshpande
3b444db1d6 am "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 
merged from goog/mirror-m-wireless-internal-release
204f80e Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I363403bf73b202f03b3f706a823b0f142183a695
 2015-03-15 13:41:25 -07:00
Vinit Deshpande
aae695b50d am "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."" 
merged from goog/mirror-m-wireless-internal-release
da35a2b Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

Change-Id: I4dc4865d58e4b68858c7767f201e267a72dc236b
 2015-03-15 13:41:14 -07:00
Vinit Deshpande
4447a5e2c7 am "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 
merged from goog/mirror-m-wireless-internal-release
40c6f2b Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I91b487137a2da621b496bf5f135fe19bb0a6ca62
 2015-03-15 13:41:04 -07:00
Vinit Deshpande
79baf378d2 am "Add multi-SIM fields to VoicemailContract.Status." 
merged from goog/mirror-m-wireless-internal-release
109dabd Add multi-SIM fields to VoicemailContract.Status.
 2015-03-15 13:40:45 -07:00
Vinit Deshpande
e94d762182 am "Refactor NetworkUtils interaction with DHCP." 
merged from goog/mirror-m-wireless-internal-release
3c3ce17 Refactor NetworkUtils interaction with DHCP.
 2015-03-15 13:40:27 -07:00
Vinit Deshpande
f5fabf1542 am "Separate NAT from forwarding." 
merged from goog/mirror-m-wireless-internal-release
35e36db Separate NAT from forwarding.
 2015-03-15 13:40:20 -07:00
Vinit Deshpande
7e05b6770c am "WFC configuration: add carrier and device support configurations." 
merged from goog/mirror-m-wireless-internal-release
9c8f21b WFC configuration: add carrier and device support configurations.
 2015-03-15 13:39:13 -07:00
Eric Laurent
2035ac85f6 broadcast radio API 
Initial implementation of system APIs for broadcast
radio framework. Added manager and interfaces to control
a broadcast radio function exposed by the radio HAL.

- RadioManager: contains data structures and definitions as well as
top level API for feature discovery and tuner interface instantiation.
- RadioTuner: interface to control a broadcast radio tuner.
- RadioModule: framework component implementing the RadioTuner interface
and controlling a HW radio module via the radio HAL.
- RadioMetadata: representation of radio meta data (Station name, PTY,
song title, artwork, etc...) communicated by the framework to the client.

Change-Id: Iee42a185c694503e25f0b2dcfa417d88f5e9549b
 2015-03-13 15:34:50 -07:00
Christopher Tate
de2826b1e9 Properly set up local transport data dirs after an initialize operation 
We were properly setting up the underlying storage at boot time, but
*not* doing so after an "initialize" operation, i.e. after wiping all
of the data upon request.  The effect was that after an init operation
while using the local transport (e.g. if you disabled backup and then
reenabled it with the local transport as your active one), full-data
backup operations wouldn't work until after the next reboot.

(Resubmit, with fixes, of earlier revert.)

Change-Id: I745cb49b5155119d63cff6fffad5230687faca71
 2015-03-13 14:41:45 -07:00
Ed Heyl
33dd7a4684 Merge "Fix build: Revert "Properly set up local transport data dirs after an initialize operation"" 2015-03-13 21:03:07 +00:00
Ed Heyl
0a809733da Fix build: Revert "Properly set up local transport data dirs after an initialize operation" 
This reverts commit dc205b3f95.

Change-Id: I6ed27c1eb8ddd1894bf0374b989a1b4e3d7761a3
 2015-03-13 21:00:45 +00:00
Christopher Tate
6bfcc6bf1c Merge "Properly set up local transport data dirs after an initialize operation" 2015-03-13 20:12:44 +00:00
Jeff Brown
3e0045e0df Merge "Avoid rebuilding epoll set when PFD status report is done." 2015-03-13 19:12:04 +00:00
Jeff Brown
031b7feb0f Merge "Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""" 2015-03-13 19:11:39 +00:00
Nick Kralevich
d028356056 am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs." 
* commit '870110e01af5c4875a9cf7134cee7c6842fd31af':
  Drop unusable SELinux APIs.
 2015-03-13 18:26:20 +00:00
Tor Norbye
417ee5ba89 Add resource type annotations to some APIs 
Change-Id: I37c8afdaea455aa92bc8270bb2dfd60616c5f9bc
 2015-03-13 11:20:45 -07:00
Nick Kralevich
870110e01a am 30fcd2aa: Merge "Drop unusable SELinux APIs." 
* commit '30fcd2aa8a87ca97e1d6dbc3203c3a485a56dac9':
  Drop unusable SELinux APIs.
 2015-03-13 18:16:58 +00:00
Stephen Smalley
16d1cce8ff Drop unusable SELinux APIs. 
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2015-03-13 14:09:26 -04:00
Raph Levien
676fa348d0 Merge "Start moving text measurement into native code" 2015-03-13 17:26:32 +00:00