233892 Commits

Author SHA1 Message Date
Paul Miller
9aca9aecab Fix WebView Metrics opt out Javadoc formatting
BUG:27305383
Change-Id: I23afa271058479263abe714f1a3493562f0cfe9e
2016-02-23 13:39:19 -08:00
Mihai Niță
86ee2c0235 Merge "Removed warning icons and use friendlier locale names" into nyc-dev 2016-02-23 21:37:05 +00:00
Pankaj Kanwar
2339b786c7 Merge changes from topic 'notification' into mm-wireless-dev
* changes:
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821
2016-02-23 21:32:15 +00:00
Joe Onorato
e1acd636d4 Make getBatteryUptimeLocked protected so it can be mocked.
Also fix test names.

Change-Id: I43477e61c22cd36735214951c45c52b39095e1b5
2016-02-23 13:28:03 -08:00
Nathan Harold
4b6d38938e Adding Error Codes for IWLAN/EPDG Connection
-Error codes related to tunnel maintenance
-Error code for DPD

Bug: 26014044
Bug: 26014458
Change-Id: Ic00a14e0502fa47e20e79a3c6ce91b3170f53a50
2016-02-23 13:25:17 -08:00
Mihai Nita
502141d50b Removed warning icons and use friendlier locale names
* Removed warning icons in locale list (b/26710677)
* Use getDisplayNameWithDialect() instead of getDisplayName()
  for the locale names (b/27066642)
* Set proper locale for the language labels (b/27130516)
* Fixed build warning in LocaleHelper (b/27148053)

Bug: 26710677
Bug: 27066642
Bug: 27130516
Bug: 27148053
Change-Id: I149a3675262b286c8b740d2ad5b02f4df31316ec
2016-02-23 13:24:27 -08:00
Joe Onorato
62b9ff4994 Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev
* changes:
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-02-23 21:06:23 +00:00
Jeff Sharkey
1ce5c28ba5 Merge "Offer to cache ringtones in system DE storage." into nyc-dev 2016-02-23 20:57:46 +00:00
Wale Ogunwale
96912d035c Merge "Clear calling identity on Session.startingMovingTask" into nyc-dev 2016-02-23 20:50:50 +00:00
Dongwon Kang
62b6a00b64 Merge "TIF: Add @NonNull for Programs.Genres.encode/decode" into nyc-dev 2016-02-23 20:45:23 +00:00
Joe Onorato
abded113bd Add unit tests for BatteryStatsImpl.
- Add a Clocks interface to wrap SystemClock.uptimeMillis and
  SystemClock.elapsedRealtime.
- Make the inner classes static so they can be created independently,
  which meant passing explicit pointers to the BatteryStatsImpl and
  the Uid objects in a lot of places.
- Make several fields protected so they can be accessed by the tests (they are
  still @hidden)
- Add a test suite for the battery stats.
- Add the tests

Change-Id: I4e45afedc64f7050985c28a7eb4f5c1ddbaa63fa
2016-02-23 12:44:22 -08:00
Joe Onorato
0c484107b1 Turn down the logging a little bit.
Change-Id: I2ea19f9a7951c215aee98825f9cb2923295a965d
2016-02-23 12:44:22 -08:00
Joe Onorato
7e1693af7f Turn down the logging a little bit.
Change-Id: I922d6f3895d80292fbf613b90e502cad462bb9ef
2016-02-23 12:44:22 -08:00
Dongwon Kang
df1e10ddac TIF: Add @NonNull for Programs.Genres.encode/decode
Bug: 27292029
Change-Id: Ib74f6383f3b0880179b51268e730ea8e88ab20c3
2016-02-23 12:43:58 -08:00
Shawn Willden
3f5fd1dbee Merge "Revert "Revert "Add option to allow key validity after fingerprint enrollment.""" into nyc-dev 2016-02-23 20:33:11 +00:00
Alan Viverette
0df7c98adf Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev 2016-02-23 20:30:08 +00:00
Jeff Sharkey
413573ac59 Offer to cache ringtones in system DE storage.
Ringtones often live on shared media, which is now encrypted with CE
keys and not available until after the user is unlocked.  To improve
the user experience while locked, cache the default ringtone,
notification sound, and alarm sound in a DE storage area.

Bug: 26730753
Change-Id: Ie6ad7790af4c87dd25759df3ed017e3b91a2fb87
2016-02-23 13:27:00 -07:00
Wale Ogunwale
09e1b8d02c Clear calling identity on Session.startingMovingTask
This call is comming from the client which doesn't have
the manage task permission required by setFocusTask in AM.

Bug: 27157914
Change-Id: I494a0c44e8fb4316a16bcd44c87bdd8d23e7e6d5
2016-02-23 20:17:04 +00:00
Alan Viverette
fde0213716 Remove @Nullable annotation from getDrawable() methods
Developers usually do not need to check the result of getDrawable(), so
we shouldn't be annotating it like they do.

Bug: 27134828
Change-Id: I0db0ca806fd89c18781da452fe3f31ef344f3cca
2016-02-23 14:59:51 -05:00
Fyodor Kupolov
07140f7ffd Disable switching users until user 0 is unlocked
Switching with user0 locked can be re-enabled by setting
allow_user_switching_when_system_user_locked flag to a non-zero value

Bug: 26933989
Change-Id: I0958058f1cc8a059db9c20930e07183c14c8460a
2016-02-23 11:58:54 -08:00
Alan Viverette
5f8e0603e6 Merge "Fix NinePatchDrawable handling of density changes" into nyc-dev 2016-02-23 19:56:24 +00:00
Alan Viverette
921ec44647 Fix NinePatchDrawable handling of density changes
Scaling is now manually applied when the canvas density is not set.

Removes set/getNinePatch accessors that were added in N, since these
are not used and setting the nine patch directly will break padding.
Also removes local NinePatch, which was not necessary.

Bug: 27038114
Change-Id: Ie8b2e485b54d1ed1521081b329a09915fd0a95c1
2016-02-23 14:54:01 -05:00
Chien-Yu Chen
d1733607cd Merge "Camera2: Fix getInternalFormatSizes for depth" into nyc-dev 2016-02-23 19:52:20 +00:00
John Reck
e5bfd2da4d Merge "destroyHardwareResources in onStop()" into nyc-dev 2016-02-23 19:45:09 +00:00
Rubin Xu
ad9758fb27 Merge "Do not show work challenge when profile is turned off." into nyc-dev 2016-02-23 19:42:04 +00:00
Etan Cohen
ae7a19e924 [NAN] API cleanup - rename FLAGS. [DO NOT MERGE]
am: ad3693d59b  -s ours

* commit 'ad3693d59b990f4994f96f6d3ca98cdbfe26723c':
  [NAN] API cleanup - rename FLAGS. [DO NOT MERGE]
2016-02-23 19:11:42 +00:00
Roshan Pius
e0e00dc79c Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev
am: 2d3bea7f01

* commit '2d3bea7f014a7fa2eff91ce996663059218bf21d':
  Modify the wake reasons data structure(2/2)
2016-02-23 19:09:24 +00:00
Aga Wronska
f4b808345d Merge "Add logic for selecting filename in RenameDocumentFragment - different selection for directory. Prevent test from creating directories in Documents folder." into nyc-dev 2016-02-23 19:04:05 +00:00
Aga Wronska
568b3b366c Add logic for selecting filename in RenameDocumentFragment - different selection for directory.
Prevent test from creating directories in Documents folder.

Change-Id: Ib656f8d69cba27b201b5fe67bcb11fa1dec04953
2016-02-23 10:57:09 -08:00
Andres Morales
74e9b18b2d Add SystemApi for retrieving device flash lock state
Bug: 26039090
Change-Id: Ib51c4862d897cc91a0788379c761ed49a2adf271
2016-02-23 10:53:49 -08:00
Anthony Chen
e87032cd75 Scale phone state icons.
The status bar icons can all be optionally scaled by the scale factor in
dimens. The phone stat icons had not been updated to include this
scaling logic.

Also allow the spacing between the icons in the mobile signal group to
be adjusted.

Change-Id: I12b35d462599f8a0747477fb280a974ffa77d01c
2016-02-23 18:53:17 +00:00
Chris Craik
91eff22b5d Support op dumping in new pipeline
bug:26565102

Change-Id: I266e420a2f18ba9ad62942b8a0de295dfa3a2a88
2016-02-23 18:52:54 +00:00
Tao Bai
eabebc1539 Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev 2016-02-23 18:52:15 +00:00
Lenka Trochtova
3dfe7f655d Throw UnsupportedOperationException when creating ephemeral
user on a system without split system user.

BUG: 27143201

Change-Id: I7b7e634ba7fce576dd72a416e802c80939f05d3e
2016-02-23 19:49:39 +01:00
Wale Ogunwale
f8df4d0d43 Merge "Changed sys-ui manifest to use resizeableActivity attribute..." into nyc-dev 2016-02-23 18:37:49 +00:00
Jae Seo
47d1f420bb Merge "TIF: Hide android.permission.READ_TV_LISTINGS" into nyc-dev 2016-02-23 18:37:41 +00:00
John Reck
d9b1607bd9 destroyHardwareResources in onStop()
Bug: 27286867

This hopefully makes everything fully-deterministic. It should
also fix some old annoyances around Bitmap lifecycle as they will
be released earlier in onStop() instead of waiting for
dispatchDetachedFromWindow() which may never happen.

Change-Id: I6e871760650780e327c0e42f62950c1052dd8019
2016-02-23 10:35:19 -08:00
Felipe Leme
978b4d0e43 Merge "Fixed MetricsLogger usage." into nyc-dev 2016-02-23 18:33:03 +00:00
Felipe Leme
d426d12bb4 Fixed MetricsLogger usage.
BUG: 26759986
Change-Id: Ice16c58f09de8778240ae845917e59bf36ccd112
2016-02-23 10:32:16 -08:00
Chris Wren
34f6f699f0 Merge "hide the nanos even harder" into nyc-dev 2016-02-23 18:25:14 +00:00
Rubin Xu
b93522a7db Do not show work challenge when profile is turned off.
When the profile is turned off, the associated user is not running so it
makes no sense to try to unlock the profile challenge.

Also adjust order of activity startup interception so suspend package takes
precedence, as that's a state user cannot recover from by his own actions.

Bug: 26928131
Change-Id: Ibb4c8ce02ba4ed2e5a5b4366cbe7b59d1535dbd7
2016-02-23 18:21:48 +00:00
Selim Cinek
729166fb44 Merge "Fixed a bug where QS could fling up even when collapsing" into nyc-dev 2016-02-23 18:21:11 +00:00
Felipe Leme
fe9731f4f2 Merge "Created counter (tron_varz_dumpstate_duration) for dumpstate duration." into nyc-dev 2016-02-23 18:14:27 +00:00
Nicolas Geoffray
65698a9638 Merge "Revive the "Optimizing apps" dialog" into nyc-dev 2016-02-23 18:04:40 +00:00
Wale Ogunwale
dc62575dd2 Changed sys-ui manifest to use resizeableActivity attribute...
Instead of resizeable attribute. resizeableActivity is what is used
for multi-window. The code currently works because it targets N :/

Change-Id: I82f1b1b46f66ea39ae682ed1d45f97bc6247b0bd
2016-02-23 10:02:58 -08:00
Aga Wronska
c7bf3f7cb8 Merge "Fix RenameDocumentFragment crash on rotation" into nyc-dev 2016-02-23 18:00:12 +00:00
Jean-Michel Trivi
7e2127a970 Merge "New constant for BUS audio devices" into nyc-dev 2016-02-23 17:55:29 +00:00
Philipp Weiß
f398479e06 Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev 2016-02-23 17:53:58 +00:00
Felipe Leme
4e34c4e53c Merge "Initial implementation of logging metrics for bugreport." into nyc-dev 2016-02-23 17:48:56 +00:00
Jason Monk
e6324f5eec Support changes in Settings for battery graph
Bug: 27205329
Change-Id: I5d15503099144f1c62bafed64ea4c8157e8851ee
2016-02-23 12:44:52 -05:00