Commit Graph

50052 Commits

Author SHA1 Message Date
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
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
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
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
Raph Levien
70616ecd22 Start moving text measurement into native code
We want to move text measurement into native code, mostly so that
alternate measurement for hyphens can be performant. This patch begins
that migration, in the main StaticLayout case, but still surfaces the
widths array to Java (for ellipsis calculation), and also includes a
hack (used mostly for testing) for computing widths in Java and sending
them down to native code when TextPaint is subclassed.

Change-Id: I476c9e8b3aa8e4e3552eb18f66c4bcd5683f3a72
2015-03-13 10:11:57 -07:00
Dianne Hackborn
484bc6e5a7 Merge "More work on collecting assist data." 2015-03-13 16:41:29 +00:00
Benjamin Franz
815eca184e Merge "Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN" 2015-03-13 16:03:05 +00:00
Santos Cordon
50ac385417 Merge "Do not hide any call log entries when they are added." 2015-03-13 16:00:37 +00:00
Yohei Yukawa
2fbea7ff90 Merge "Expose isSystemImeThatHasSubtypeOf to Settings" 2015-03-13 13:46:40 +00:00
Yohei Yukawa
9c83ff471d Expose isSystemImeThatHasSubtypeOf to Settings
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3

In the avobe CLs, an internal (hidden) method
InputMethodUtils.isValidSystemDefaultIme was marked as
deprecated and we decided to migrate to
InputMethodUtils.isSystemImeThatHasSubtypeOf.

To finish this refactoring, this CL make the new
method visible to the settings app.

InputMethodUtils.isValidSystemDefaultIme remains
to be an internal method. No behavior change is
intended.

Change-Id: I8cb9ca40d15af099c3d1ded46797fb57f14fb9e8
2015-03-13 22:43:06 +09:00
Clara Bayarri
80c3856122 Support a Primary and a Floating ActionMode in DecorView.
This CL modifies the support for a single ActionMode in PhoneWindow.
DecorView to support both a Primary and a Floating ActionModes
simultaneously.

Things pending after this CL:
- Handling an actual Floating ActionMode
- Cleaning up the now unused ActionModeWrapper and its related code

Change-Id: Ie2e5ec27393ce9eededadf5bc379bab39981a365
2015-03-13 10:51:51 +00:00
Clara Bayarri
4423d91de5 Add a type parameter to startActionMode() calls.
This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
2015-03-13 10:51:51 +00:00
Benjamin Franz
68cc42009e Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN
Bug: 19704419
Change-Id: I3fc970eae8ef947775b6b565916bb245dea1b43b
2015-03-13 09:44:44 +00:00
Andreas Gampe
db64454b33 resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
2015-03-13 00:04:10 -07:00
Jeff Brown
b2a1985b13 Avoid rebuilding epoll set when PFD status report is done.
If we close the PFD status channel before returning, then the Looper
will take care of unregistering it correctly but it will end up
doing extra work to rebuild the epoll set to work around a limitation
of the epoll interface.  If we unregister the FD first then this
extra work will not be required so it's slightly more efficient
this way.

Bug: 19715279
Change-Id: I0f7b90f3458adf1894b7561c05fa842fdb87b498
2015-03-12 19:52:46 -07:00
Jeff Brown
6fd9f9af2e Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""
This reverts commit 0f0b7f2fb3.
2015-03-12 19:45:47 -07:00
Christopher Tate
dc205b3f95 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.

Change-Id: I3bfda1e94ae2312678b0bb2dde13ebdb64a56d2b
2015-03-12 19:00:39 -07:00
Wenchao Tong
c3b022ded1 Merge "NetworkStatsService to adjust VPN stats before recording." 2015-03-13 00:54:09 +00:00
Wenchao Tong
f5ea340aab NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
2015-03-12 17:43:41 -07:00
Hui Shu
d7c7e566aa Merge "Add API for WebView OffscreenPreRaster setting." 2015-03-13 00:38:47 +00:00