summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-12-11166-43942/+62468
| | | | | | | Auto-generated-cl: translation import Bug: 26151591 Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
* Add IMS settings to Network setting resetHyejin Kim2015-12-011-0/+3
| | | | | | | Add the factory reset function to be used to reset IMS settings BUG=25300757 Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
* Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ↵Geoff Mendal2015-11-200-0/+0
|\ | | | | | | | | | | | | | | | | ours am: 74e9c3d348 -s ours * commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGE am: 2102350ea3 -s oursGeoff Mendal2015-11-200-0/+0
| |\ |/ / | | | | | | | | | | am: 75dd183bf7 -s ours * commit '75dd183bf7b99c995fe773e7b53a6604a6b53512': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEGeoff Mendal2015-11-200-0/+0
| |\ | | | | | | | | | | | | | | | | | | am: 2102350ea3 -s ours * commit '2102350ea33d8bbed50d9447889876fa295b3e8a': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-11-2018-205/+205
| | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
* | | Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d * commit 'f0d538f08da7c45e545e51e93373afe38cbd518f': Block developer settings during SUW
| * | Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 * commit '2b295010392c532a47e02e5b003459a50d6d5a62': Block developer settings during SUW
| | * Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 * commit '5950ff1d69ca27c09569f40862201ede261c831e': Block developer settings during SUW
| | | * Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e * commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70': Block developer settings during SUW
| | | | * Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3edRussell Brenner2015-11-172-1/+11
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b * commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4': Block developer settings during SUW
| | | | | * Merge "Block developer settings during SUW" into lmp-mr1-devRussell Brenner2015-11-172-1/+11
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 56d630a3ed * commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd': Block developer settings during SUW
| | | | | | * Merge "Block developer settings during SUW" into lmp-mr1-devRussell Brenner2015-11-172-1/+11
| | | | | | |\
| | | | | | | * Block developer settings during SUWRussell Brenner2015-11-102-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block access to development settings by tapping on the build number in "About phone". Once SUW has completed, taps will be allowed. Bug: 25290269 Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
* | | | | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 am: 8199c3028c * commit '8199c3028c05cd9c85b6f26fe656518f536bda69': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| * | | | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 * commit '38e932dc816fe7aff6443bfa5648743f527aa097': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | * | | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 * commit '439033dd93417b98acff392865166503a507ff30': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | * | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours * commit '6967df642114a9c84d993cfd544d5a32f04c26b1': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | * | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79Russell Brenner2015-11-171-2/+7
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 97759fa8d1 * commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | | * | | [DO NOT MERGE] Preserve FRP lock if wiped during SUWRussell Brenner2015-11-171-2/+7
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 14bf226c79 * commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | | | * | [DO NOT MERGE] Preserve FRP lock if wiped during SUWRussell Brenner2015-11-131-2/+7
| | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against FRP attacks by keeping the persistent data block intact, if a factory reset has been issued during SUW. Bug: 25290269 Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
* | | | | | | Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de ↵Russell Brenner2015-11-171-2/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2075d98be6 am: 7d44fe6fdb * commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63': Preserve FRP lock if wiped during SUW
| * | | | | | Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631deRussell Brenner2015-11-171-2/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2075d98be6 * commit '2075d98be6199032d0bdf65d9e1789153e12fb66': Preserve FRP lock if wiped during SUW
| | * | | | | Merge "Preserve FRP lock if wiped during SUW" into mnc-devRussell Brenner2015-11-171-2/+7
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f0ff1631de * commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80': Preserve FRP lock if wiped during SUW
| | | * | | | Merge "Preserve FRP lock if wiped during SUW" into mnc-devRussell Brenner2015-11-171-2/+7
| | | |\ \ \ \
| | | | * | | | Preserve FRP lock if wiped during SUWRussell Brenner2015-11-131-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against FRP attacks by keeping the persistent data block intact, if a factory reset has been issued during SUW. [resolves merge conflicts with ag/808069] Bug: 25290269 Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
* | | | | | | | Uncheck checkbox for contact sharing by default for non carkit devices. am: ↵Sanket Padawe2015-11-170-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98f11fd1a4 am: 28eca8e8c2 am: 773b8a3c44 * commit '773b8a3c4422ab9daf7adb62895568852b43882e': Uncheck checkbox for contact sharing by default for non carkit devices.
| * | | | | | | Uncheck checkbox for contact sharing by default for non carkit devices. am: ↵Sanket Padawe2015-11-170-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98f11fd1a4 am: 28eca8e8c2 * commit '28eca8e8c2d9e11a9f304e85ff3a34819edd68a9': Uncheck checkbox for contact sharing by default for non carkit devices.
| | * | | | | | Uncheck checkbox for contact sharing by default for non carkit devices.Sanket Padawe2015-11-170-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 98f11fd1a4 * commit '98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3': Uncheck checkbox for contact sharing by default for non carkit devices.
| | | * | | | | Uncheck checkbox for contact sharing by default for non carkit devices.Sanket Padawe2015-11-121-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + In BT pairing dialog, uncheck checkbox for contact sharing by default for devices not recognized as carkits at pair time. Bug: 23607427 Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76 (cherry picked from commit dbc47fb262a4273417d99dabab757854aa3b0eaf)
* | | | | | | | Uncheck checkbox for contact sharing by default for non carkit devices. am: ↵Sanket Padawe2015-11-131-16/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbc47fb262 am: 0ad16831ee * commit '0ad16831ee2e2029a0fc2891c8007505bb9779cd': Uncheck checkbox for contact sharing by default for non carkit devices.
| * | | | | | | Uncheck checkbox for contact sharing by default for non carkit devices.Sanket Padawe2015-11-121-16/+17
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dbc47fb262 * commit 'dbc47fb262a4273417d99dabab757854aa3b0eaf': Uncheck checkbox for contact sharing by default for non carkit devices.
| | * | | | | | Uncheck checkbox for contact sharing by default for non carkit devices.Sanket Padawe2015-11-121-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + In BT pairing dialog, uncheck checkbox for contact sharing by default for devices not recognized as carkits at pair time. Bug: 23607427 Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
* | | | | | | | Null check queryIntentServices am: a4c9492b50Jason Monk2015-11-091-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e27cada8c4 * commit 'e27cada8c49c8aec2463c352faf5211502b1b372': Null check queryIntentServices
| * | | | | | | Null check queryIntentServicesJason Monk2015-11-091-3/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a4c9492b50 * commit 'a4c9492b50b742488a6a92abdc290b5ada3c004b': Null check queryIntentServices
| | * | | | | | Null check queryIntentServicesJason Monk2015-11-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25575738 Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
* | | | | | | | Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram ↵Dianne Hackborn2015-10-302-7/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d am: a42bad972c * commit 'a42bad972ca44f52ac84b3139198acc11dec0d4f': Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
| * | | | | | | Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram ↵Dianne Hackborn2015-10-302-7/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d * commit '3b4e4dd91d416c93fdc0326e54469ceabb8281ab': Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS
| | * | | | | | Merge "Further tweak to issue #issue #25371736: Don't include z-ram ↵Dianne Hackborn2015-10-302-7/+12
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | allocations in Android OS" into mnc-dr-dev
| | | * | | | | | Further tweak to issue #issue #25371736: Don't include z-ram allocations in ↵Dianne Hackborn2015-10-292-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android OS Make sure the duration shown for z-ram is sane (the maximum of the other process durations of that app). Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
* | | | | | | | | Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" ↵Dianne Hackborn2015-10-291-0/+40
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev am: 508559d076 am: 68954d930d * commit '68954d930d0a583c7150e1a3959d5a798b8e5f34': Fix issue #25371736: Don't include z-ram allocations in Android OS
| * | | | | | | | Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" ↵Dianne Hackborn2015-10-291-0/+40
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev am: 508559d076 * commit '508559d0760596509f07fa56371c6e18d8bd9559': Fix issue #25371736: Don't include z-ram allocations in Android OS
| | * | | | | | | Merge "Fix issue #25371736: Don't include z-ram allocations in Android OS" ↵Dianne Hackborn2015-10-291-0/+40
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | into mnc-dr-dev
| | | * | | | | | Fix issue #25371736: Don't include z-ram allocations in Android OSDianne Hackborn2015-10-291-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just distribute them across all of the running apps, by creating an additional fake "z-ram" process for each of them. Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
* | | | | | | | | Import translations. DO NOT MERGE am: 260d90a102 -s oursGeoff Mendal2015-10-280-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 04817defc9 -s ours * commit '04817defc935af871ec90b971f61d4b31d28c97d': Import translations. DO NOT MERGE
| * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-280-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 260d90a102 -s ours * commit '260d90a102b3a0d7ba51c5bf73d34291ef2f4910': Import translations. DO NOT MERGE
| | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-283-3/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd Auto-generated-cl: translation import
* | | | | | | | Import translations. DO NOT MERGE am: c338bacb59 -s oursGeoff Mendal2015-10-260-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 884a8bbe78 -s ours * commit '884a8bbe7872e8d7aa94f854e4057d2d073cd09a': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-260-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c338bacb59 -s ours * commit 'c338bacb59b13bed45239a587e3429b4bed00a71': Import translations. DO NOT MERGE
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-264-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f Auto-generated-cl: translation import
generated by cgit v1.1 at 2025-01-25 14:31:42 +0000