summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Add android.net.CaptivePortal class for captive-portal-handling-app callbacksPaul Jensen2015-07-092-26/+25
* Merge "Log DNS results for network validation attempts" into mnc-devPaul Jensen2015-07-011-6/+24
|\
| * Log DNS results for network validation attemptsPaul Jensen2015-06-301-6/+24
* | Merge "Reducing logging in NetworkMonitor to avoid getting muted" into mnc-devPaul Jensen2015-07-011-19/+6
|\ \ | |/
| * Reducing logging in NetworkMonitor to avoid getting mutedPaul Jensen2015-06-301-19/+6
* | Merge "Fix dispatch of onRestoreFinished()" into mnc-devChristopher Tate2015-07-011-38/+40
|\ \
| * | Fix dispatch of onRestoreFinished()Christopher Tate2015-06-301-38/+40
* | | Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-devYohei Yukawa2015-07-012-4/+9
|\ \ \
| * | | Reland "Fixed constant window switching on lock screen..."Yohei Yukawa2015-06-302-4/+9
* | | | Merge "Hand out storage to more system apps." into mnc-devJeff Sharkey2015-07-011-2/+22
|\ \ \ \
| * | | | Hand out storage to more system apps.Jeff Sharkey2015-06-301-2/+22
* | | | | Merge "Don't allow non-admins to adopt sd card for internal storage" into mnc...Amith Yamasani2015-06-301-0/+17
|\ \ \ \ \
| * | | | | Don't allow non-admins to adopt sd card for internal storageAmith Yamasani2015-06-301-0/+17
* | | | | | Merge "Do not hold a lock when calling API to grant default permissions" into...Svet Ganov2015-06-301-3/+8
|\ \ \ \ \ \
| * | | | | | Do not hold a lock when calling API to grant default permissionsSvet Ganov2015-06-301-3/+8
* | | | | | | Merge commit '91d2cbf4' into manualmergeBryce Lee2015-06-301-0/+5
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge "Installer is a part of the system with unrevocable permissions" into m...Svet Ganov2015-06-301-1/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Installer is a part of the system with unrevocable permissionsSvet Ganov2015-06-301-3/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "add more power manager metrics" into mnc-devChris Wren2015-06-302-0/+16
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | add more power manager metricsChris Wren2015-06-302-0/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "resolved conflicts for merge of e89d821e to mnc-dev" into mnc-devFilip Gruszczynski2015-06-301-2/+80
|\ \ \ \ \ \
| * \ \ \ \ \ resolved conflicts for merge of e89d821e to mnc-devFilip Gruszczynski2015-06-291-2/+80
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-devFilip Gruszczynski2015-06-291-2/+80
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "Dump of previous vibrations." into cw-d-mr1-devFilip Gruszczynski2015-06-291-2/+80
| | | |\ \ \ \ \
| | | | * | | | | Dump of previous vibrations.Filip Gruszczynski2015-06-291-2/+80
* | | | | | | | | Merge "[LockSettings] adjust legacy patterns to base 0 for unlocking keystore...Andres Morales2015-06-301-1/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | [LockSettings] adjust legacy patterns to base 0 for unlocking keystoreAndres Morales2015-06-291-1/+12
* | | | | | | | | Merge "Don't reevaluate disconnected networks" into mnc-devPaul Jensen2015-06-301-1/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Don't reevaluate disconnected networksPaul Jensen2015-06-261-1/+4
* | | | | | | | | Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an expli...Billy Lau2015-06-301-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggleBilly Lau2015-06-261-0/+23
* | | | | | | | | | Merge "Marking some globals from setGlobalSetting as not supported" into mnc-devEsteban Talavera2015-06-301-10/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Marking some globals from setGlobalSetting as not supportedEsteban Talavera2015-06-291-10/+17
* | | | | | | | | | | Merge "Make ContentObservers work across profiles" into mnc-devBenjamin Franz2015-06-301-12/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make ContentObservers work across profilesBenjamin Franz2015-06-291-12/+27
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Fix issue #22185268: apps crash with missing permissions and NPE on Ap...Dianne Hackborn2015-06-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix issue #22185268: apps crash with missing permissions and NPE on AppOpsMan...Dianne Hackborn2015-06-291-1/+1
* | | | | | | | | | | | Merge "Fix use of reachable DNS server logic" into mnc-devErik Kline2015-06-301-44/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix use of reachable DNS server logicErik Kline2015-06-301-44/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Fix buildSvet Ganov2015-06-291-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge "Grant default permissons to the default SMS, Phone, Browser app." into...Svetoslav2015-06-304-95/+246
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Grant default permissons to the default SMS, Phone, Browser app.Svetoslav2015-06-294-96/+247
* | | | | | | | | | | Add accessibility event for assist disclosureJorim Jaggi2015-06-301-0/+2
* | | | | | | | | | | Merge "Add setting to disable screenshot separately (1/2)" into mnc-devJorim Jaggi2015-06-301-4/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add setting to disable screenshot separately (1/2)Jorim Jaggi2015-06-291-4/+7
* | | | | | | | | | | | Merge "Auto grant GET_ACCOUNTS where appropriate." into mnc-devDianne Hackborn2015-06-301-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Auto grant GET_ACCOUNTS where appropriate.Dianne Hackborn2015-06-261-1/+40
* | | | | | | | | | | | Merge "Volume change intent carries stream alias" into mnc-devJean-Michel Trivi2015-06-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Volume change intent carries stream aliasJean-Michel Trivi2015-06-291-0/+2
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge "Check system locale when picking up an initial SpellChecker." into mnc...Yohei Yukawa2015-06-291-4/+38
|\ \ \ \ \ \ \ \ \ \ \