summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virt...Dianne Hackborn2014-10-031-1/+1
|\
| * Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...Dianne Hackborn2014-10-031-1/+1
* | am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation."...Dianne Hackborn2014-10-021-2/+6
|\ \ | |/
| * Merge "SDK only: Update docs to reflect current implementation." into lmp-devDianne Hackborn2014-10-021-2/+6
| |\
| | * SDK only: Update docs to reflect current implementation.Dianne Hackborn2014-10-021-2/+6
* | | am 5aaabc0f: Merge "Send app permissions to netd." into lmp-devSreeram Ramachandran2014-10-021-1/+1
|\ \ \ | |/ /
| * | Send app permissions to netd.Sreeram Ramachandran2014-10-011-1/+1
| |/
* | am c338784b: Merge "More work on issue #17656716: Unhandled exception in Wind...Dianne Hackborn2014-10-021-4/+19
|\ \ | |/
| * More work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-10-011-4/+19
* | am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" int...Narayan Kamath2014-10-011-2/+24
|\ \ | |/
| * Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-devNarayan Kamath2014-10-011-2/+24
| |\
| | * Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABISNarayan Kamath2014-09-301-2/+24
* | | am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Wind...Dianne Hackborn2014-09-302-6/+21
|\ \ \ | |/ /
| * | More work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-302-6/+21
| |/
* | am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Ma...Dianne Hackborn2014-09-302-1/+22
|\ \ | |/
| * Work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-292-1/+22
| * Frameworks/base: Early init native bridgejgu212014-09-281-1/+9
* | am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception i...Dianne Hackborn2014-09-261-4/+20
|\ \ | |/
| * Merge "More debugging for issue #17656716: Unhandled exception in Window Mana...Dianne Hackborn2014-09-261-4/+20
| |\
| | * More debugging for issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-261-4/+20
* | | am 70c1f083: Merge "Set the system locale correctly even on an encrypted devi...Elliott Hughes2014-09-261-0/+8
|\ \ \ | |/ /
| * | Set the system locale correctly even on an encrypted device.Elliott Hughes2014-09-261-0/+8
| |/
* | am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Ma...Dianne Hackborn2014-09-261-5/+19
|\ \ | |/
| * Work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-09-251-5/+19
* | am 45ef18b6: Merge "Include reason when wiping data." into lmp-devJeff Sharkey2014-09-241-15/+58
|\ \ | |/
| * Merge "Include reason when wiping data." into lmp-devJeff Sharkey2014-09-241-15/+58
| |\
| | * Include reason when wiping data.Jeff Sharkey2014-09-241-15/+58
* | | resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aospAndreas Gampe2014-09-241-1/+9
|\ \ \
| * | | Frameworks/base: Early init native bridgejgu212014-09-221-1/+9
* | | | am b5a2f9ea: am 6974f6a9: Merge "Block address families with routes, not Netw...Lorenzo Colitti2014-09-241-3/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Block address families with routes, not NetworkAgent side channelLorenzo Colitti2014-09-231-3/+0
| | |/ | |/|
* | | am d2484f81: am ba108d11: Merge "Allow primary user profile owner to set devi...Amith Yamasani2014-09-191-16/+21
|\ \ \ | |/ /
| * | Allow primary user profile owner to set device restrictionsAmith Yamasani2014-09-181-16/+21
* | | am 0c5b7311: am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-devAdam Powell2014-09-181-1/+3
|\ \ \ | |/ /
| * | Fix UserManager#isUserAGoatAdam Powell2014-09-171-1/+3
* | | am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mo...John Spurlock2014-09-142-0/+18
|\ \ \ | |/ /
| * | Saver: PowerManager call to set low power mode.John Spurlock2014-09-142-0/+18
* | | am 46c1851a: am a561b237: Merge "Allow throwing UnsupportedOperationException...Dianne Hackborn2014-09-131-0/+5
|\ \ \ | |/ /
| * | Allow throwing UnsupportedOperationException across Binder.Dianne Hackborn2014-09-121-0/+5
* | | am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation tim...Alexandra Gherghina2014-09-121-0/+1
|\ \ \ | |/ /
| * | Assign default icon to users at creation time and in SystemUI.Alexandra Gherghina2014-09-121-0/+1
* | | am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_F...Michael Wright2014-09-121-3/+3
|\ \ \ | |/ /
| * | Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITYMichael Wright2014-09-121-3/+3
* | | am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into...Amith Yamasani2014-09-112-1/+8
|\ \ \ | |/ /
| * | Apply cross-user restrictions to ShellAmith Yamasani2014-09-102-1/+8
* | | am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC be...Amith Yamasani2014-09-091-78/+115
|\ \ \ | |/ /
| * | Merge "User restriction to disallow outgoing NFC beam" into lmp-devAmith Yamasani2014-09-091-78/+115
| |\ \
| | * | User restriction to disallow outgoing NFC beamAmith Yamasani2014-09-091-78/+115
| * | | Frameworks/base: Add native bridge post-fork initializationAndreas Gampe2014-09-081-1/+9
| |/ /
* | | resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aospElliott Hughes2014-09-081-1/+2
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2025-10-16 22:17:48 +0000