Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
76308ce86f Merge "Performance improvements in AssetManager" into nyc-dev am: 3765d34d36 
am: 2b798a2344

* commit '2b798a2344feeeb64b74e8dab4042f7d7f3879ab':
  Performance improvements in AssetManager

Change-Id: I01c50ad7695e478f299f497441fdea0ab8e24116
 2016-05-21 00:18:30 +00:00
Adam Lesinski
bffbb765d7 Merge "Performance improvements in AssetManager" into nyc-dev 
am: 3765d34d36

* commit '3765d34d364e76817e9dbea55819df86d858df10':
  Performance improvements in AssetManager

Change-Id: Id552f8bc9753f2d336ab2e9cf1f05d5e5b2a2409
 2016-05-21 00:13:37 +00:00
Adam Lesinski
2b798a2344 Merge "Performance improvements in AssetManager" into nyc-dev 
am: 3765d34d36

* commit '3765d34d364e76817e9dbea55819df86d858df10':
  Performance improvements in AssetManager

Change-Id: Ie364041be0fb6757c2f87d5b8d570cb07452d112
 2016-05-21 00:13:33 +00:00
Adam Lesinski
3765d34d36 Merge "Performance improvements in AssetManager" into nyc-dev 2016-05-21 00:07:01 +00:00
Suprabh Shukla
ffddadb04a Fixing isOpRestricted in AppOpsService 
AppOpsService was returning false for a restricted operation if the
operation did not allow the system to bypass the restrictions on it.

Bug: 28860721
Change-Id: I487e23f1d3bf6ea602caee439fb500c058e7c8ff
 2016-05-20 16:37:33 -07:00
Robert Carr
3e637da407 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: 89770ebf62" into nyc-mr1-dev-plus-aosp 
am: 2d510f9d99

* commit '2d510f9d990484cf1100e76df3497857d5e86915':

Change-Id: I780b9bf222f5da439ed8be982f7790c194322bc3
 2016-05-20 23:13:46 +00:00
Robert Carr
a7dfbc9437 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp 
am: abb81c5972

* commit 'abb81c59729ad97e1207449c84f8e96986ea2a6a':
  Correctly clear resizing drawable when nulling background.

Change-Id: I50ee5eda0a88af238719a83a3e39ed81da0f2dbe
 2016-05-20 23:13:36 +00:00
Brad Ebinger
6c82927d7d Merge "Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 am: e130c935a4" into nyc-mr1-dev-plus-aosp 
am: c0d61dec97

* commit 'c0d61dec97c9cd824a5bca5bb0d0635c5080c1d8':

Change-Id: I6f4ca09715d2aebc932f096adb1e590eac522520
 2016-05-20 23:13:30 +00:00
Brad Ebinger
b1a8cc612d Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 am: a1fa294de8 
am: 547420c846

* commit '547420c84662669ea428aaf0a7034ab85e99d45c':
  Add check for Vibration RingerMode in VibratorService

Change-Id: I63f0793432bf3ea8437ee4edbb1fd1ba726b306b
 2016-05-20 23:13:17 +00:00
Android Build Merger (Role)
2d510f9d99 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: 89770ebf62" into nyc-mr1-dev-plus-aosp 2016-05-20 23:09:03 +00:00
Android Build Merger (Role)
abb81c5972 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp 2016-05-20 23:08:57 +00:00
Android Build Merger (Role)
c0d61dec97 Merge "Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 am: e130c935a4" into nyc-mr1-dev-plus-aosp 2016-05-20 23:08:52 +00:00
Robert Carr
ac0ed76278 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 
am: fe25025c5c

* commit 'fe25025c5c9e551599a8ce5228cc5d4b41385f3b':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ib93cee44edc0317a806d90ea2b2a44d293af1c1f
 2016-05-20 23:08:20 +00:00
Robert Carr
0ee80d4420 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 
am: 89770ebf62

* commit '89770ebf62d8a15dc899f89f29a541fbb839ee69':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ie1347dd9d19c15b8e42611268b3c92e1ff1e4738
 2016-05-20 23:08:19 +00:00
Brad Ebinger
547420c846 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 
am: a1fa294de8

* commit 'a1fa294de82114fbf4b1b3ae4121727bc611ef75':
  Add check for Vibration RingerMode in VibratorService

Change-Id: I3b0a54c064f622444d4ab28d2efba988e5ff5a8c
 2016-05-20 23:08:15 +00:00
Brad Ebinger
fde019b1bc Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 
am: e130c935a4

* commit 'e130c935a456a1b044f3757e01c623baddad0320':
  Add check for Vibration RingerMode in VibratorService

Change-Id: I21fa3e5328e3a2b5b595ff5d1367417fa3e881b0
 2016-05-20 23:08:14 +00:00
Robert Carr
89770ebf62 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: I9cbb109bbd7891c30711a68bf88d8b2c4332baa3
 2016-05-20 23:01:03 +00:00
Robert Carr
fe25025c5c Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ifb02cc95efc8b164ab8ee63fa9d83bae3172da23
 2016-05-20 23:01:02 +00:00
Brad Ebinger
a1fa294de8 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev 
am: ecab20d852

* commit 'ecab20d852826286e4d9d8c095ef61cebbb0ab4e':
  Add check for Vibration RingerMode in VibratorService

Change-Id: If1c4c9969b16cd751f802e62ec6960762e4fbafa
 2016-05-20 23:00:59 +00:00
Brad Ebinger
e130c935a4 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev 
am: ecab20d852

* commit 'ecab20d852826286e4d9d8c095ef61cebbb0ab4e':
  Add check for Vibration RingerMode in VibratorService

Change-Id: Iaab0a9006897ba57e25be58723c96f2bc214df71
 2016-05-20 23:00:58 +00:00
TreeHugger Robot
a3ec065a43 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 2016-05-20 22:56:47 +00:00
Christopher Wiley
1cc6ffd2b3 Add demonstration unittest for TetherInterfaceSM 
Prove that the concept works by writing a trivial test.

Bug: 28833951
Test: `runtest frameworks-services -c
  com.android.server.connectivity.tethering.TetherInterfaceSMTest`

Change-Id: I51911cef7f0d5165221845070befd085497c21a6
 2016-05-20 15:56:31 -07:00
Christopher Wiley
e3f93b02bd Extract TetherInterfaceSM to its own class. 
Attempt to keep all existing logic in place, except:

 + Marked a constructor as public, rather than default visible.
 + Added TAG, DBG, VDBG, and decoder ringer statics.
 + Moved static constants related to USB IPs into TetherInterfaceSM.

Bug: 28833951
Test: WiFi Tethering works on angler.

Change-Id: Id961220a9045832354cfe7381e5e9c0d8f54bf90
 2016-05-20 15:56:25 -07:00
Christopher Wiley
9a509ca728 Make Tethering.TetherInterfaceSM more self contained 
Remove references from the class into the containing class:
  - Move functionality to bring up a USB interface into the class itself.
  - Extract an interface to wrap methods where TetherInterfaceSM was
    calling into other private classes of Tethering
  - Inject necessary dependendencies into TetherInterfaceSM instances.

Bug: 28833951
Test: Compiles.

Change-Id: Ic96947417cf8734072d027b0f1cba8a1a1be7a74
 2016-05-20 15:56:13 -07:00
Brad Ebinger
ecab20d852 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev 2016-05-20 22:53:27 +00:00
Adrian Roos
d9a0ba6a9e Merge "Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990" into nyc-mr1-dev am: eb70ae584c" into nyc-mr1-dev-plus-aosp 
am: e5de90d136

* commit 'e5de90d13690d7f768f1def668b27bb177144837':

Change-Id: I9063ef2ba6305d0ceac4dd3b35949ead886eecdd
 2016-05-20 22:36:02 +00:00
Meng Wang
faf4843b99 Merge "Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev am: ac517216c5" into nyc-mr1-dev-plus-aosp 
am: f71eae2644

* commit 'f71eae2644ce2f8c3b1227df91248637f0231257':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ie2ffd247f9803b822c9cdd4080edfcfe6a18e9b9
 2016-05-20 22:33:22 +00:00
Adrian Roos
82c8589cf3 Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990 am: d5d76f6d5c 
am: b7894e1804

* commit 'b7894e1804dd29a23aaf87f9f65cd7080f9fb00e':
  Fix cut off actions in messaging style

Change-Id: I5856db22351a0f391666edc52019cbf34c2b524e
 2016-05-20 22:26:53 +00:00
Android Build Merger (Role)
e5de90d136 Merge "Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990" into nyc-mr1-dev am: eb70ae584c" into nyc-mr1-dev-plus-aosp 2016-05-20 22:24:19 +00:00
Android Build Merger (Role)
f71eae2644 Merge "Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev am: ac517216c5" into nyc-mr1-dev-plus-aosp 2016-05-20 22:24:06 +00:00
Adrian Roos
7bff407318 Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990" into nyc-mr1-dev 
am: eb70ae584c

* commit 'eb70ae584cef85d2ddfd435a832ec02437e31a06':
  Fix cut off actions in messaging style

Change-Id: Ic2208930558eac09bd5c823caa4150302b8c708b
 2016-05-20 22:23:18 +00:00
Meng Wang
fe9ed66227 Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev 
am: ac517216c5

* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
 2016-05-20 22:21:26 +00:00
Adrian Roos
b7894e1804 Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990 
am: d5d76f6d5c

* commit 'd5d76f6d5c4b36b18ff5129312eb2d2b4aa23fe5':
  Fix cut off actions in messaging style

Change-Id: I7f84c9e30185942c4fb200880718a3b3d272fdd3
 2016-05-20 22:21:17 +00:00
Android Build Merger (Role)
eb70ae584c Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990" into nyc-mr1-dev 2016-05-20 22:17:31 +00:00
Meng Wang
ac517216c5 Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev 2016-05-20 22:17:11 +00:00
Adrian Roos
d5d76f6d5c Merge "Fix cut off actions in messaging style" into nyc-dev 
am: cbfef08990

* commit 'cbfef08990e4d44c723da71f7f7271a72fb10f17':
  Fix cut off actions in messaging style

Change-Id: I732a67af98e2ee083ef004e3266e6662b85308ad
 2016-05-20 22:17:10 +00:00
Adrian Roos
ed1f7f41c0 Merge "Fix cut off actions in messaging style" into nyc-dev 
am: cbfef08990

* commit 'cbfef08990e4d44c723da71f7f7271a72fb10f17':
  Fix cut off actions in messaging style

Change-Id: Ie4ba804300222128034d157199a7be3b14facf3e
 2016-05-20 22:17:08 +00:00
Adrian Roos
cbfef08990 Merge "Fix cut off actions in messaging style" into nyc-dev 2016-05-20 22:08:37 +00:00
Adam Lesinski
76da37e1cf Performance improvements in AssetManager 
Change the implementation of getLocales() to iterate the set of
configurations using a templated method, instead of using the result
of getConfigurations().

Also remove the check for AndroidManifest.xml when adding an asset path.
This is unneccessary.

Bug:28625993
Change-Id: I16de5da598d0c371421d1dc8eee054dce9baf53a
 2016-05-20 15:04:09 -07:00
Jae Seo
486b5dfca8 Merge "Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 am: f2f9867437" into nyc-mr1-dev-plus-aosp 
am: 15271acf70

* commit '15271acf7075f88c081588284bb8c83591374acb':

Change-Id: I25b4543999976310b89107c172c79ec7b2702763
 2016-05-20 21:15:31 +00:00
Jae Seo
86b36a4c6c Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 am: 79108f18bf 
am: 91b7a92ca0

* commit '91b7a92ca025bc2d6e81b35985ff1be4cb0f6f7b':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: I37df22bf31bd5e32005611744122eb69311683af
 2016-05-20 21:11:07 +00:00
Android Build Merger (Role)
15271acf70 Merge "Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 am: f2f9867437" into nyc-mr1-dev-plus-aosp 2016-05-20 21:07:49 +00:00
Jae Seo
c9da4f8b1c Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 
am: f2f9867437

* commit 'f2f9867437b1f1c71d5a6a2246b14470881ccc28':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: I462e30c2ddc354203c635051254b11eedb545ed9
 2016-05-20 21:07:26 +00:00
Jae Seo
91b7a92ca0 Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 
am: 79108f18bf

* commit '79108f18bf73f0a1689dff903dac923045a9de59':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: Ic01bd347bb78c5d3119d4f5e8ecf02c736b7018c
 2016-05-20 21:07:23 +00:00
Jae Seo
f2f9867437 Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev 
am: 44fbbfd248

* commit '44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: Id16ebed81d2865553e3ded626cf9b27dffba8dce
 2016-05-20 21:03:00 +00:00
Adrian Roos
18d099a8fb Keep notifications with active remote inputs 
Fixes a bad interaction when the app cancels the notification
into which the user is typing. This happens for example when
the user initiates direct reply from the lock screen and the
app is currently open underneath the lockscreen.

Also cleans up the code that clears notification effects by
moving it into the appropriate place (without functional changes).

Fixes: 28745456
Change-Id: I69e076642e93930d41cfb06f2a48836aea34d92d
 2016-05-20 14:02:20 -07:00
Jae Seo
79108f18bf Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev 
am: 44fbbfd248

* commit '44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: I0cc37df958a3419770cc943a077f35bd3c41a324
 2016-05-20 21:02:11 +00:00
Jae Seo
44fbbfd248 Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev 2016-05-20 20:53:03 +00:00
Brad Ebinger
2d1c3b3a6c Add check for Vibration RingerMode in VibratorService 
Add a check for whether or not the Phone is in the Vibrate RingerMode
when deciding whether or not to vibrate for an incoming call.

Bug: 28569078
Change-Id: Ib2e6243fd0b18c5426b5572c0806d67111a80a57
 2016-05-20 20:31:53 +00:00
Meng Wang
64997623bf Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager 
Also:
   Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS

Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
 2016-05-20 13:18:41 -07:00