Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Zen: Add a new level: alarms-only." | John Spurlock | 2015-04-03 | 2 | -2/+18 |
|\ | |||||
| * | Zen: Add a new level: alarms-only. | John Spurlock | 2015-04-02 | 2 | -2/+18 |
* | | Merge "TIF: Add time shift APIs." | Dongwon Kang | 2015-04-03 | 1 | -0/+154 |
|\ \ | |||||
| * | | TIF: Add time shift APIs. | Dongwon Kang | 2015-04-02 | 1 | -0/+154 |
* | | | Merge "Refactor KeySet code." | dcashman | 2015-04-03 | 5 | -338/+364 |
|\ \ \ | |||||
| * | | | Refactor KeySet code. | dcashman | 2015-03-31 | 5 | -338/+364 |
* | | | | Do not clear a shared user's permissions on an app install. | Svetoslav | 2015-04-02 | 2 | -2/+8 |
| |_|/ |/| | | |||||
* | | | resolved conflicts for merge of 65073b91 to master | Wale Ogunwale | 2015-04-02 | 2 | -14/+10 |
|\ \ \ | |||||
| * \ \ | am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity." | Olawale Ogunwale | 2015-04-02 | 2 | -14/+10 |
| |\ \ \ | |||||
| | * \ \ | Merge "[ActivityManager] Avoid improper resume top activity." | Olawale Ogunwale | 2015-04-02 | 2 | -14/+10 |
| | |\ \ \ | |||||
| | | * | | | [ActivityManager] Avoid improper resume top activity. | riddle_hsu | 2015-04-02 | 2 | -14/+10 |
* | | | | | | Prepare to make Fingerprint API public. | Jim Miller | 2015-04-01 | 3 | -6/+214 |
* | | | | | | Merge "Deal with null characters in string options." | Lorenzo Colitti | 2015-04-02 | 3 | -6/+135 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Deal with null characters in string options. | Lorenzo Colitti | 2015-04-01 | 3 | -6/+135 |
* | | | | | | Merge "Start searching the dimension configuration for atlas from the biggest... | ztenghui | 2015-04-01 | 1 | -6/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Start searching the dimension configuration for atlas from the biggest value. | ztenghui | 2015-04-01 | 1 | -6/+7 |
* | | | | | | | am d7e349e8: am 7eeaad24: am 7a1454fe: Merge "Do not use the status bar as th... | Bryce Lee | 2015-04-01 | 1 | -2/+8 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Fixed NPE when trying to animate a windows whose display is gone. | Wale Ogunwale | 2015-04-01 | 3 | -28/+30 |
* | | | | | | | fixed build breakage due to bad merge. again... | Wale Ogunwale | 2015-04-01 | 1 | -1/+1 |
* | | | | | | | fixed build breakage due to bad merge. | Wale Ogunwale | 2015-04-01 | 1 | -1/+0 |
* | | | | | | | resolved conflicts for merge of 2094bf7b to master | Wale Ogunwale | 2015-04-01 | 2 | -14/+16 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity" | Olawale Ogunwale | 2015-04-01 | 2 | -15/+16 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | [ActivityManager] Reduce report wrong anr activity | riddle_hsu | 2015-04-01 | 2 | -15/+16 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Converted more log points in AMS to use ActivityManagerDebugConfig. | Wale Ogunwale | 2015-04-01 | 7 | -396/+405 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge "Revert "Add lockTaskOnLaunch attribute."" | Craig Mautner | 2015-04-01 | 2 | -33/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "Add lockTaskOnLaunch attribute." | Craig Mautner | 2015-04-01 | 2 | -33/+11 |
* | | | | | | am a54f2b16: am 8bed4843: am d720dedb: Merge "Clear the previous states befor... | Craig Mautner | 2015-04-01 | 1 | -0/+5 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am d720dedb: Merge "Clear the previous states before setting the new app visi... | Craig Mautner | 2015-04-01 | 1 | -5/+5 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge "Clear the previous states before setting the new app visibility" | Craig Mautner | 2015-03-31 | 1 | -5/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | Clear the previous states before setting the new app visibility | tiger_huang | 2015-03-26 | 1 | -5/+5 |
* | | | | | | | Merge "Add lockTaskOnLaunch attribute." | Craig Mautner | 2015-04-01 | 2 | -11/+33 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Add lockTaskOnLaunch attribute. | Craig Mautner | 2015-03-31 | 2 | -11/+33 |
* | | | | | | | Merge "Data usage API: any uid is accessible to system apps running in any user" | Qiwen Zhao | 2015-04-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Data usage API: any uid is accessible to system apps running in any user | Zoltan Szatmary-Ban | 2015-03-31 | 1 | -1/+1 |
* | | | | | | | | Merge "Fix clobbered shared user install permissions." | Svet Ganov | 2015-03-31 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix clobbered shared user install permissions. | Svet Ganov | 2015-03-31 | 2 | -2/+2 |
* | | | | | | | | | Merge "Clear the previous states before setting the new app visibility" | Craig Mautner | 2015-03-31 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Clear the previous states before setting the new app visibility | tiger_huang | 2015-03-31 | 1 | -5/+5 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Support for nested bundles in setApplicationRestrictions" | Fyodor Kupolov | 2015-03-31 | 2 | -78/+231 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Support for nested bundles in setApplicationRestrictions | Fyodor Kupolov | 2015-03-30 | 2 | -78/+231 |
* | | | | | | | | | | Merge "Add CameraService to system server." | Ruben Brunk | 2015-03-31 | 2 | -0/+71 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add CameraService to system server. | Ruben Brunk | 2015-03-31 | 2 | -0/+71 |
* | | | | | | | | | | | Merge "Fix WindowOrientationListener crash if no sensor present" | Adrian Roos | 2015-03-31 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix WindowOrientationListener crash if no sensor present | Adrian Roos | 2015-03-31 | 1 | -2/+6 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge "[Auth:Last Credentials Timing] : Introducing API" | Simranjit Singh Kohli | 2015-03-31 | 1 | -15/+95 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | [Auth:Last Credentials Timing] : Introducing API | Simranjit Singh Kohli | 2015-03-30 | 1 | -15/+95 |
* | | | | | | | | | | | Merge "Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS." | Wale Ogunwale | 2015-03-31 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS. | Wale Ogunwale | 2015-03-27 | 1 | -3/+6 |
* | | | | | | | | | | | | Merge "Fixes to full-backup scheduling edge cases" | Christopher Tate | 2015-03-31 | 2 | -37/+81 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixes to full-backup scheduling edge cases | Christopher Tate | 2015-03-30 | 2 | -37/+81 |