Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209,410 Commits 3 Branches 0 Tags
5bdaeeafe66bf96aa92ef13e73f35ff7c7be701e
Commit Graph

56186 Commits

Author SHA1 Message Date
Robin Lee
5bdaeeafe6 Merge "Fix funky javadoc" 2015-07-29 16:32:07 +00:00
Robin Lee
1472c92128 Fix funky javadoc 
Using @link for the first word of a @throws line is redundant and
generates strange HTML where the row appears twice.

See for example:
    http://developer.android.com/reference/android/net/VpnService.Builder.html#addAllowedApplication%28java.lang.String%29

Change-Id: I9c0bbe9156d292eb6f0e2e2ccb6dbcfef95bc312
 2015-07-29 17:25:06 +01:00
Derek Sollenberger
2d35cf953a Merge "Support High Contrast Text for all canvas types" 2015-07-29 14:36:09 +00:00
Jeff Sharkey
4b76c496c6 am 7412dfe9: am 3f6c3849: am 170235a3: am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit '7412dfe98daaf76377fc5d08e8b9bf994455b2a3':
  Give secondary users read-only physical cards.
 2015-07-29 03:41:19 +00:00
Jeff Sharkey
7412dfe98d am 3f6c3849: am 170235a3: am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit '3f6c3849e96692da51c0e8cb22cce92b6ed9b60b':
  Give secondary users read-only physical cards.
 2015-07-29 03:20:52 +00:00
Dianne Hackborn
bfdaab5fda am 578d21fd: am e319841d: am 05e4e78d: am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit '578d21fddc2e15441d3404e6ee5c5813d95165d6':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 02:31:14 +00:00
Dianne Hackborn
578d21fddc am e319841d: am 05e4e78d: am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit 'e319841da95a22152bfc4c519a2ab99478b7f68c':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 02:12:17 +00:00
Adam Lesinski
7ca82d915e am 2a098fe9: am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit '2a098fe90ab0e60c2326e9aedbfdd85529de782f':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 02:10:51 +00:00
Jeff Sharkey
170235a368 am acfaa947: am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit 'acfaa947f45ce1ea8140c2dc52d5f750dbc0a94d':
  Give secondary users read-only physical cards.
 2015-07-29 02:01:13 +00:00
Adam Lesinski
2a098fe90a am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit '2529d39d3184ab66207f3fde9f2106276a2c1c16':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 01:47:06 +00:00
Jeff Sharkey
acfaa947f4 am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev 
* commit 'b8040265dd0d5a2a96e0850623647dad2f528db1':
  Give secondary users read-only physical cards.
 2015-07-29 01:34:42 +00:00
Dianne Hackborn
05e4e78d24 am 1b391d64: am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit '1b391d6499c161ded570ef45ad3083458529723d':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 01:26:55 +00:00
Jeff Sharkey
b8040265dd Merge "Give secondary users read-only physical cards." into mnc-dev 2015-07-29 01:19:43 +00:00
Adam Lesinski
858e4a6f89 am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit '9aae8d9c1b2219f9d98ac07b1fe04ef62c4cacb9':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 01:02:09 +00:00
Dianne Hackborn
1b391d6499 am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 
* commit 'b492ced89eaf38b2b9962dbfae2435dd242abf19':
  Fix issue #22802782: APR: NPE in package manager with bad intent data
 2015-07-29 01:00:37 +00:00
Jorim Jaggi
e1d440be81 am 7580672f: am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit '7580672fa8455dccc78806dcd878a5e191a62a45':
  Animation for touch, wake and unlock
 2015-07-29 00:49:19 +00:00
Dianne Hackborn
b492ced89e Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev 2015-07-29 00:45:18 +00:00
Adam Lesinski
9aae8d9c1b am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 
* commit 'c96e6f19937ac36c8147a52863a43b35895aeb0b':
  BatteryStats: Use proper power calculator when energy data is received
 2015-07-29 00:41:03 +00:00
Adam Lesinski
c96e6f1993 Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev 2015-07-29 00:34:38 +00:00
Dianne Hackborn
9dc6c61a80 Fix issue #22802782: APR: NPE in package manager with bad intent data 
If they pass in a null data for the intent matching, don't throw up
on it, just consider it to not match.

Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
 2015-07-28 17:30:59 -07:00
Jorim Jaggi
7580672fa8 am ce58fa95: am fed9b281: am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit 'ce58fa9593ae9b0d5e29485019876bde5c54848b':
  Animation for touch, wake and unlock
 2015-07-29 00:28:13 +00:00
Adam Lesinski
c691d3ccf4 BatteryStats: Use proper power calculator when energy data is received 
We check for the presence of energy data when determining whether to use
the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data
later, we need to switch to the WiFiPowerCalculator if we weren't using it before.

We can't ask the hardware if it supports energy data because that would involve a call into
WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock
while using this class.

Bug:22776010
Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
 2015-07-28 17:11:29 -07:00
Jorim Jaggi
fed9b2817f am 353fe1c6: am 0d210f63: Animation for touch, wake and unlock 
* commit '353fe1c665e0065d4c8eecdf41c22f1a1a607f2c':
  Animation for touch, wake and unlock
 2015-07-28 23:43:46 +00:00
Amit Mahajan
9069fab8bc Changes to update APN db via Gservices and ConfigUpdater. 
- Adding settings that are updated by Gservices.
- Changes to handle UPDATE_APN_DB intent.
- UPDATE_APN_DB intent triggers update of apns-conf.xml and carriers db.

Change-Id: I65a63f3015da1b827b974d17e48bee4c747544ff
 2015-07-28 23:22:10 +00:00
Jorim Jaggi
353fe1c665 am 0d210f63: Animation for touch, wake and unlock 
* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock
 2015-07-28 23:19:39 +00:00
Jorim Jaggi
0d210f6395 Animation for touch, wake and unlock 
- Add callback to inform SysUI when the screen has been unblocked
and turned on.
- Cleanup inconsistent messaging about device interactive/screen on
and off.
- Add callbacks to inform SysUI about screen states
- Implement a quick fade for the scrim after touch, wake, and unlock.
  First, start with a black scrim on top of everything, and then fade
  it out.
- Make sure we play the normal unlock animation when device is pulsing
- Override navigation bar animations for touch, wake and unlock: Fade
  in the same manner as the scrim.

Bug: 22571198
Bug: 21855614
Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
 2015-07-28 23:02:54 +00:00
Jeff Sharkey
4634987668 Give secondary users read-only physical cards. 
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.

More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.

This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users.  Other users remain able to read content elsewhere
on the card.

Bug: 22787184
Change-Id: Ied8c98995fec1b7b50ff7d930550feabb4398582
 2015-07-28 14:42:34 -07:00
Dianne Hackborn
6105a30d9d am 0091e2c0: am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '0091e2c03d1f2d212c94a3096e86407c78df6820':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:26:50 +00:00
Robert Greenwalt
6a35968cf8 am 691b8104: am f99b6f28: am 872d264c: am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit '691b81042f0d443dc16d82426c043d4a3f76378a':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 21:26:33 +00:00
Dianne Hackborn
0091e2c03d am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '639fd0e9d8ecb59f8d15b3f1e5ec7a6ae6cc3161':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 21:03:15 +00:00
Robert Greenwalt
691b81042f am f99b6f28: am 872d264c: am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit 'f99b6f2886cde0406798f0b8b4b1666c29b387bf':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 21:03:04 +00:00
Dianne Hackborn
025a5dc6de am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '108f5493edb50201d3dd2ba32a19db93edad8800':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 20:22:50 +00:00
Robert Greenwalt
872d264c0a am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit 'd6162cf244eab3a3c77a011ffe75dd04a787b951':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 20:22:41 +00:00
Dianne Hackborn
108f5493ed am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
 2015-07-28 19:57:40 +00:00
Robert Greenwalt
d6162cf244 am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 
* commit 'b3c93c5f4256a1da1a8020abe5812a841b67667a':
  Un-remove legacy ConnectivityManager API.
 2015-07-28 19:57:31 +00:00
Dianne Hackborn
3551a59b27 Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 2015-07-28 19:52:53 +00:00
Dianne Hackborn
57dd737443 Work on issue #21516866: Implement voice interaction in ResolverActivity 
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
 2015-07-28 12:52:11 -07:00
Robert Greenwalt
b3c93c5f42 Merge "Un-remove legacy ConnectivityManager API." into mnc-dev 2015-07-28 19:39:48 +00:00
Lorenzo Colitti
98140ecef0 am 2ae3a05b: am b0014e9f: am 08ef66bb: am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit '2ae3a05b424f7ef7c3a28507e2c19fde7f1e5963':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 18:48:06 +00:00
Mady Mellor
db31070269 am 74280180: am 3e120946: am 840b524e: am 9659297d: am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev 
* commit '74280180d10d0de8b83b6022bf72033aa93dd6e1':
  Allow text selection handles to scroll horizontally
 2015-07-28 18:47:02 +00:00
Filip Gruszczynski
d261e83603 am 6a5791d1: am 95275dc7: am 5a8e31ef: am 3bb0bb3a: am f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev 
* commit '6a5791d163e9f8dab1efb3e2a713ee521c347b32':
  Remove unnecessary relayout call from traversals.
 2015-07-28 18:46:33 +00:00
Robert Greenwalt
a36c074052 Un-remove legacy ConnectivityManager API. 
These were @removed too soon.  We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.

bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
 2015-07-28 11:41:31 -07:00
Raph Levien
a76361a47b am a9d7a86f: am a26ece2e: am 78c0a044: am 9c9c0eb8: am e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev 
* commit 'a9d7a86f38478be0196bd8b1f379e6ecedcd8ae5':
  Allow soft hyphens in languages without patterns
 2015-07-28 07:36:56 +00:00
Lorenzo Colitti
2ae3a05b42 am b0014e9f: am 08ef66bb: am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit 'b0014e9f38bb7e01ba488e50c61f3fc9a7aaf9fc':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 02:02:59 +00:00
Lorenzo Colitti
08ef66bbbc am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit '62ca62b32aae083c0f2d8b0bbec1fbd7d698f4ad':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:33:03 +00:00
Lorenzo Colitti
62ca62b32a am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* commit 'e288b3af14421731d8f477b97e8d77588f20498b':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:20:16 +00:00
Lorenzo Colitti
e288b3af14 Merge changes I5c994de5,I6cb0dd84 into mnc-dev 
* changes:
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.
 2015-07-28 01:03:44 +00:00
Mady Mellor
74280180d1 am 3e120946: am 840b524e: am 9659297d: am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev 
* commit '3e12094692427ec30d8c97644483aa9f5fe0e309':
  Allow text selection handles to scroll horizontally
 2015-07-28 00:57:47 +00:00
Filip Gruszczynski
6a5791d163 am 95275dc7: am 5a8e31ef: am 3bb0bb3a: am f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev 
* commit '95275dc7caedda2e22524cae721dc13396ae15e4':
  Remove unnecessary relayout call from traversals.
 2015-07-28 00:57:29 +00:00
Mady Mellor
840b524efb am 9659297d: am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev 
* commit '9659297d9c26a8a2fdfa3c0e23b92e0fb72398ca':
  Allow text selection handles to scroll horizontally
 2015-07-28 00:31:14 +00:00