summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to ↵Carlos Valdivia2014-02-271-1/+55
|\ | | | | | | | | | | | | launch arbitrary activities. * commit '9272db024d013fbb48ec476c77562ab31d75a461': Prevent authenticators from using Settings to launch arbitrary activities.
| * Prevent authenticators from using Settings to launch arbitrary activities.Carlos Valdivia2014-02-271-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various authenticator results such as getAuthToken and addAccount might result in an Intent returned to the AccountManager caller. A malicious authenticator could exploit the fact that the Settings are a system app, lead the user to launch add account for their account type and thus get Settings to use the intent to start some arbitrary third parties Activity. The fix is to make sure that the UID of the app associated with Activity to be launched by the supplied intent and the Authenticators UID share the same signature. This means that an authenticator implementer can only exploit apps they control. Bug: 7699048 Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce (cherry picked from commit 5bab9daf3cf66f4de19f8757e386030e8bef23ce)
* | am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigsRobert Greenwalt2014-02-251-0/+12
|\ \ | |/ | | | | | | * commit '868d4c341034de6e2ebb6c1a247488b00d17c78d': DO NOT MERGE Sanitize WifiConfigs
| * DO NOT MERGE Sanitize WifiConfigsRobert Greenwalt2014-02-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do this both on input from apps (giving error) and between wifi and ConnectivityService (ignoring bad data). This means removing all addresses beyond the first and all routes but the first default and the implied direct-connect routes. We do this because the user can't monitor the others (no UI), their support wasn't intended, they allow redirection of all traffic without user knowledge and they allow circumvention of legacy VPNs. This should not move forward from JB as it breaks IPv6 and K has a more resilient VPN. Bug:12663469 Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2 Conflicts: core/java/android/net/LinkProperties.java services/java/com/android/server/WifiService.java wifi/java/android/net/wifi/WifiStateMachine.java
* | am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location ↵Daniel Cashman2014-01-131-0/+5
|\ \ | |/ | | | | | | | | | | providers disabled Bug: 12118307" into jb-mr2-dev * commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8': Clear cached locations when location providers disabled Bug: 12118307
| * Clear cached locations when location providers disabledDavid Christie2014-01-061-0/+5
| | | | | | | | | | | | | | | | Bug: 12118307 (cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e) Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c
* | am fd706246: am 562fddce: am 05e3f55f: am 1d8f592a: am ef12b1d4: am ↵Christopher Tate2013-11-081-0/+12
|\ \ | |/ | | | | | | | | | | ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' * commit 'fd70624629c42b0e0444a4d99ba64d58551fa6b0': System package permission decls take precedence over 3rd party apps'
| * am 05e3f55f: am 1d8f592a: am ef12b1d4: am ea198841: am ef4694cb: am ↵Christopher Tate2013-11-081-0/+12
| |\ | | | | | | | | | | | | | | | | | | ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' * commit '05e3f55f17e36b415a23095dbeaa1d04716aed5a': System package permission decls take precedence over 3rd party apps'
| | * am 1d8f592a: am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am ↵Christopher Tate2013-11-081-0/+12
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' * commit '1d8f592a752c30534a6e03889f1ba42b232770ef': System package permission decls take precedence over 3rd party apps'
| | | * am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am 43253333: am ↵Christopher Tate2013-11-081-0/+12
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50cbfd55: System package permission decls take precedence over 3rd party apps\' * commit 'ef12b1d4a9ba6a91b61647feadaf2c4cdf34c356': System package permission decls take precedence over 3rd party apps'
| | | | * am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System ↵Christopher Tate2013-11-081-0/+12
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package permission decls take precedence over 3rd party apps\' * commit 'ea198841a9e64d72de49811e0e2c555eb2c40b9b': System package permission decls take precedence over 3rd party apps'
| | | | | * am ae229d99: am 43253333: am 50cbfd55: System package permission decls take ↵Christopher Tate2013-11-081-0/+12
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | precedence over 3rd party apps\' * commit 'ae229d991711745bdf8da2e716c31efde534e6da': System package permission decls take precedence over 3rd party apps'
| | | | | | * am 43253333: am 50cbfd55: System package permission decls take precedence ↵Christopher Tate2013-11-081-0/+12
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | over 3rd party apps\' * commit '43253333d24e856a7ffef818fdfaedf3fd60d3b6': System package permission decls take precedence over 3rd party apps'
| | | | | | | * am 50cbfd55: System package permission decls take precedence over 3rd party ↵Christopher Tate2013-11-081-0/+12
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps\' * commit '50cbfd554f0bdf05c701d8baf15c862fbb8a6dc0': System package permission decls take precedence over 3rd party apps'
| | | | | | | | * System package permission decls take precedence over 3rd party apps'Christopher Tate2013-11-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, if a 3rd party app tries to define a permission that turns out to be defined by system packages following an upgrade, the system package gets ownership and grants are re-evaluated on that basis. Bug 11242510 (Cherry-pick backport to JB) Change-Id: Iabf7b6280e6c6674a51af5624142bd19ea0750ed
| | * | | | | | | am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am ↵Christopher Tate2013-05-061-1/+10
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore * commit '04d6141033c66a1777ba0c66d67a7540e4c3e89c': Ensure install-during-restore is like install-then-restore
| | | * | | | | | am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am ↵Christopher Tate2013-05-061-1/+10
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81c1d8d3: Ensure install-during-restore is like install-then-restore * commit 'dfb33b860f0c936d8af6555835da0ef1aea6c870': Ensure install-during-restore is like install-then-restore
| | | | * | | | | am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure ↵Christopher Tate2013-05-061-1/+10
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-during-restore is like install-then-restore * commit 'fcfc99c064f0b91fa419784bd90bb9944b9ab9f4': Ensure install-during-restore is like install-then-restore
| | | | | * | | | am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like ↵Christopher Tate2013-05-061-1/+10
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-then-restore * commit 'd3a57029e80073aa3c7dfe1dbc8945d32968f6ae': Ensure install-during-restore is like install-then-restore
| | | | | | * | | am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like ↵Christopher Tate2013-05-061-1/+10
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-then-restore * commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4': Ensure install-during-restore is like install-then-restore
| | | | | | | * | am 81c1d8d3: Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | | | | | | |\ \ | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df': Ensure install-during-restore is like install-then-restore
| | | | | | | | * Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we've installed an apk from the archive, recheck whether to apply the system-uid policy restrictions around file system restores. Bug 8833099 (cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39) Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
| | | | | | | * | am 64d1f3ef: DO NOT MERGE - Full (local) restore security changesChristopher Tate2012-09-281-20/+43
| | | | | | | |\ \ | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '64d1f3efd759b70462aecb6cf1d8c733872a8911': DO NOT MERGE - Full (local) restore security changes
| | | | | | | | * DO NOT MERGE - Full (local) restore security changesChristopher Tate2012-09-271-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (1) Prevent full restore from creating files/directories that are accessible by other applications (2) Don't restore filesets from "system" packages; i.e. any that runs as a special uid, unless they define their own agent for handling the restore process. Bug 7168284 This is a cherry-pick from the originating tree. Change-Id: I9f39ada3c4c3b7ee63330b015e62745e84ccb58f
* | | | | | | | | am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." ↵Wink Saville2013-09-061-8/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '50f864480d6e9cf9e4d83b4533e3764753b4d408': Do not change NetworkInfo.DetailedState.
| * | | | | | | | Do not change NetworkInfo.DetailedState.Wink Saville2013-09-051-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd changed DetailedState to force ConnectivityService to treat provisioning apn's specially. In particular so that they wouldn't be identified they were fully connected until the provisioning actually started. The problem is that DetailedState is a public enum that has a CTS test and just changing the CTS to allow for the new state (CONNECTED_TO_PROVISIONING_NETWORK) was inappropriate. Instead I've added a new mIsConnectedToProvisioningNetwork variable and used the DetailedState.SUSPENDED as the intermediate state. Bug: 10620248 Change-Id: Id4a842398cad67455541ce629959351c27d83639
* | | | | | | | | am 8cb2f42e: am 948282b0: Add support for handling mobile provisioning networks.Wink Saville2013-08-291-92/+353
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8cb2f42eea2ef3b249528aa7913fc7a6dfc6b741': Add support for handling mobile provisioning networks.
| * | | | | | | | Add support for handling mobile provisioning networks.Wink Saville2013-08-291-92/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a sim is new or it has expired it needs to be provisioned with the carrier. Basically provisioning is associating a sim with a user account. When a sim isn't provisioned then operators will restrict access to the network and only allow certain addresses or services to be used. This set of changes allows two types of provisioning networks to be recognized. The first is a network that causes all DNS lookups to be redirected to a different address than was intended. This is exemplified by how T-Mobile works. The second technique uses a special apn for provisioning. An example is AT&T where lwaactivate is the provisioning apn and broadband is the normal apn. We first try broadband and if we are unable to connect we try lwaactivate. When we see the activate we identify it as special and the ApnContext.isProvisioningApn will return true. In the future our plan is to create a new network type that can be added to the apn list, but for now it identified by name. Here is a list of significant changes: - CaptivePortalTracker now only test WiFi networks instead of all networks - checkMobileProvisioning checks for provisioning networks and doesn't try to ping. - IConnectivityManager.aidl changes: * getProvisioningOrActiveNetworkInfo was added to and used by Manage mobile plan in WirelessSettings so even when there is no active network it will still allow provisioning. Otherwise it would report no internet connection. * setSignInErrorNotificationVisible is used by both CaptiviePortalTracker and checkMobileProvisioning so they use the same code for the notifications. * checkMobileProvisioning was simplified to have only a timeout as returning the result is now harder as we abort simultaneous call otherwise we'd could get into loops because we now check every time we connect to mobile. - Enhanced MDST to handle the provisioning network. - Added CONNECTED_TO_PROVISIONING_NETWORK to NetworkInfo to make a new state so we don't announce to the world we're connected. - TelephonyIntents.ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN is sent by the low level data connection code to notify Connectivity Service that a provisioning apn has connected. This allows CS to handle the connection differently than a normal connection. Bug: 10328264 Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
* | | | | | | | | am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to ↵Wink Saville2013-08-261-5/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DcTracker. * commit '33283a9726a29b5a79d7885fe194d52c0ebe7450': DO NOT MERGE: MDST is not ready until connected to DcTracker.
| * | | | | | | | DO NOT MERGE: MDST is not ready until connected to DcTracker.Wink Saville2013-08-161-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the system becomes loaded the PhoneApp can be delayed significantly and a call to setEnableFailFastMobileData may not occur because the channel between the MobileDataStateTracker (MDST) and DcTracker (DCT) is not connected. Solution: Add a isReady to MDST and isMobileDataStateTrackerReady to ConnectivityService and call it from isMobileOk. Bug: 10351868 Change-Id: I92f9d58121b88186b636cd71c2fd2ef9a28f7cf6
* | | | | | | | | am b42beeaf: am e63411f2: In isMobileOk don\'t execute finally if mobile ↵Wink Saville2013-08-261-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data is not supported. * commit 'b42beeafcf8117fb4ac41dd91fc9e6113c0d6aae': In isMobileOk don't execute finally if mobile data is not supported.
| * | | | | | | | In isMobileOk don't execute finally if mobile data is not supported.Wink Saville2013-08-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the early return outside the try {} finally so we don't call setEnableFailFastMobileData(DctContants.DISABLED). Otherwise referencing counting is wrong and an exception is thrown in DcTrackerBase. Bug: 10304904 Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
* | | | | | | | | am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected ↵Wink Saville2013-08-081-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable fail fast." into jb-mr2-dev * commit '02eab434ad9faa25291e63023b7e66698ca457a8': If in a mobile captive portal is detected enable fail fast.
| * | | | | | | | Merge "If in a mobile captive portal is detected enable fail fast." into ↵Wink Saville2013-08-081-0/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | * | | | | | | | If in a mobile captive portal is detected enable fail fast.Wink Saville2013-08-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When captive portal checking completes pass back the result. This is used to enable/disable failing fast for mobile. When failing fast is enabled we don't check for data stalls and thus won't be continually trying to do recovery operations, such as restarting the radio. Bug: 9462512 Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
* | | | | | | | | | am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices ↵Wink Saville2013-08-081-3/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateable provisioning urls." into jb-mr2-dev * commit '55adb390bb96175db9abee3ead349a98b4dc4262': Have CaptivePortalTracker use gservices updateable provisioning urls.
| * | | | | | | | | Merge "Have CaptivePortalTracker use gservices updateable provisioning ↵Wink Saville2013-08-081-3/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | urls." into jb-mr2-dev
| | * | | | | | | | | Have CaptivePortalTracker use gservices updateable provisioning urls.Wink Saville2013-08-051-3/+6
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After detecting there is a captive portal the url used in the notification for mobile networks should be updateable via gservices. These urls will be the same as used by CheckMp and is needed for carriers that have specific provisioning urls such as AT&T and Verizon. Bug: 9622647 Change-Id: Idcf4dabc72ece1dbbe1d5e5a21e550dd06fe16c7
* | | | | | | | | | am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-devWink Saville2013-08-081-3/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b6363e5e6d37e3e8d103751d81613eeca32bbbf': Check that hipri has started.
| * | | | | | | | | Merge "Check that hipri has started." into jb-mr2-devWink Saville2013-08-081-3/+20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Check that hipri has started.Wink Saville2013-08-071-3/+20
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I needed to test the result of startUsingNetworkFeature, otherwise on mobile networks that are slow to come up, we won't detect warm SIMs after booting. Bug: 9962943 Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
* | | | | | | | | | am 9f11f105: am 7f09ec39: Fix issue #10226007: Reset apps restores most of ↵Dianne Hackborn2013-08-071-4/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the changed settings... * commit '9f11f105cd2983021a73b9aa921674fbff3457f3': Fix issue #10226007: Reset apps restores most of the changed settings...
| * | | | | | | | | Fix issue #10226007: Reset apps restores most of the changed settings...Dianne Hackborn2013-08-071-4/+14
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to original but not all modified ones Very stupid mistakes in messing up the iteration when pruning op entries. Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
* | | | | | | | | am 373a2f15: am 607b414d: Add new app ops method to reset all op modes.Dianne Hackborn2013-08-021-15/+87
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '373a2f15667956ff8a00ba59b42972b9c930af92': Add new app ops method to reset all op modes.
| * | | | | | | | Add new app ops method to reset all op modes.Dianne Hackborn2013-08-021-15/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
* | | | | | | | | am 019f4385: am 7925e7cc: Merge "Revert "Add version identifier to app ↵Dave Burke2013-08-021-16/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ops."" into jb-mr2-dev * commit '019f4385d17234324db23521149e1f1cb6d7d061': Revert "Add version identifier to app ops."
| * | | | | | | | Merge "Revert "Add version identifier to app ops."" into jb-mr2-devDave Burke2013-08-021-16/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Add version identifier to app ops."Dave Burke2013-08-021-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 483a6bbfc118409b9c46b226cf0aa6afdc4d9159. Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
* | | | | | | | | | am aa268f8f: am d364859c: Merge "Add version identifier to app ops." into ↵Sascha Prueter2013-08-011-5/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'aa268f8fb2855335fc0d4f181cbf91505448e5eb': Add version identifier to app ops.
| * | | | | | | | | Merge "Add version identifier to app ops." into jb-mr2-devSascha Prueter2013-08-011-5/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
generated by cgit v1.1 at 2025-01-23 23:32:29 +0000