Skip to content
Permalink
Branch: aosp-plus_4.4
Commits on Nov 2, 2014
  1. Don't show nfc unlock setting if device doesn't have nfc

    tombriden committed Nov 2, 2014
    Change-Id: I5b4b8633f27ef7d9cc657d256c80c3a71c076e80
Commits on Jul 12, 2014
Commits on Jun 3, 2014
  1. Nfc Unlock (1/3)

    tombriden committed May 11, 2014
    Adds setting to security where Nfc tags can be added to a list of authorised tags that can bypass the lock screen security
    
    Requires changes to frameworks_base and packages_apps_Settings
    
    Change-Id: I35214253c32687650ae2e2ba7dc54e9cedb10175
  2. Add different options for Nfc polling (1/2)

    tombriden committed May 10, 2014
    Change-Id: Ica15c230a015a1bf0afc6284664bc23a8d2e0713
  3. Added option to allow disabling of safe headset warning (ported from CM)

    tombriden committed May 11, 2013
    Conflicts:
    	res/values/strings.xml
    
    Change-Id: I56a9e8df9e397cfe2ad6c02fd288a7dfc7bc4114
  4. SECURITY FIX: Fix package uids being reused between uninstall and rei…

    koush authored and tombriden committed Mar 30, 2013
    …nstall of different packages.
    
    Policies for older packages were being granted to the newly installed package that got the recyled uid.
    
    Change-Id: I6c74cf6762e8da10e09d5cf5d94e9f826e47f24d
  5. Fix exception on rotation.

    maniac103 authored and tombriden committed Mar 29, 2013
    Change-Id: I6cc653db3397074fb1cd9aa12b06511ce2cc3c9d
    JIRA:CYAN-731
  6. Fix scrollbars appearing out of place in Superuser.

    maniac103 authored and tombriden committed Mar 11, 2013
    Change-Id: Ia206623716192e479901c02cf94de84a29e0479e
  7. Switch to new Superuser

    koush authored and tombriden committed Feb 28, 2013
    Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
    
    Conflicts:
    	proguard.flags
    	res/xml/settings_headers.xml
Commits on Apr 22, 2014
  1. Prohibit uninstall of the default (or only) home app

    Christopher Tate The Android Automerger
    Christopher Tate authored and The Android Automerger committed Apr 22, 2014
    We suppress the ability to uninstall (including uninstall of updates to
    system-bundled apps) when the package in question is either the only
    installed home app, or has been explicitly tagged by the user as the
    "every time" home app among all those installed.
    
    Bug 14162565
    
    Change-Id: I582bb0d2abf0911ac68813f4c7e6fd7d17bfc2ca
Commits on Mar 24, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Mar 24, 2014
    Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
    Auto-generated-cl: translation import
Commits on Mar 19, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Mar 19, 2014
    Change-Id: I4fe915d0452b637fc646265dca39732877a12444
    Auto-generated-cl: translation import
Commits on Mar 17, 2014
  1. Import translations. DO NOT MERGE

    Geoff Mendal
    Geoff Mendal committed Mar 17, 2014
    Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
    Auto-generated-cl: translation import
Commits on Mar 13, 2014
  1. Add string parameter order to default SMS dialog text

    David Braun
    David Braun committed Mar 13, 2014
    Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
    Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
Commits on Mar 12, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Mar 12, 2014
    Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
    Auto-generated-cl: translation import
Commits on Mar 11, 2014
  1. Merge "Import translations. DO NOT MERGE" into klp-dev

    Baligh Uddin Android (Google) Code Review
    Baligh Uddin authored and Android (Google) Code Review committed Mar 11, 2014
  2. Merge "DO NOT MERGE Add preference for caption text opacity" into klp…

    alanv authored and Android (Google) Code Review committed Mar 11, 2014
    …-dev
  3. Merge "DO NOT MERGE Remove extra fragment in captioning preferences" …

    alanv authored and Android (Google) Code Review committed Mar 11, 2014
    …into klp-dev
Commits on Mar 10, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Mar 10, 2014
    Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
    Auto-generated-cl: translation import
Commits on Mar 8, 2014
  1. Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev

    weiw2 authored and Android (Google) Code Review committed Mar 8, 2014
Commits on Mar 7, 2014
  1. DO NOT MERGE Add preference for caption text opacity

    alanv committed Mar 7, 2014
    BUG: 11990225
    Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
  2. DO NOT MERGE Remove extra fragment in captioning preferences

    alanv committed Mar 7, 2014
    BUG: 11813771
    Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
Commits on Mar 6, 2014
  1. DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946

    rbfletcher authored and Matthew Xie committed Feb 25, 2014
    During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML
    
    Bug: 12976386
    Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
  2. DO NOT MERGE Change bluetooth off display message.

    weiw2 committed Mar 3, 2014
    Cherry picking ble advertising changes from master to KLP MR2.
    b/13137996
    
    Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
Commits on Feb 20, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Feb 20, 2014
    Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
    Auto-generated-cl: translation import
Commits on Feb 5, 2014
  1. am 8f94821: am c68a6bd: am 0ad7744: am 7c0ada6: am 3f72207: am 1ba0936:…

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    … am 0fce612: am 7a2d8bd: am 49d502a: am c7843db: Remove unused DebugIntentSender
    
    * commit '8f9482170835059c11cffa9c554191306db49fbd':
      Remove unused DebugIntentSender
  2. am c68a6bd: am 0ad7744: am 7c0ada6: am 3f72207: am 1ba0936: am 0fce612:…

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    … am 7a2d8bd: am 49d502a: am c7843db: Remove unused DebugIntentSender
    
    * commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
      Remove unused DebugIntentSender
  3. am 0ad7744: am 7c0ada6: am 3f72207: am 1ba0936: am 0fce612: am 7a2d8bd:…

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    … am 49d502a: am c7843db: Remove unused DebugIntentSender
    
    * commit '0ad774458a627cc4608c717a7efdadf2404d973c':
      Remove unused DebugIntentSender
  4. am 7c0ada6: am 3f72207: am 1ba0936: am 0fce612: am 7a2d8bd: am 49d502a:…

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    … am c7843db: Remove unused DebugIntentSender
    
    * commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
      Remove unused DebugIntentSender
  5. am 3f72207: am 1ba0936: am 0fce612: am 7a2d8bd: am 49d502a: am c7843db:…

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    … Remove unused DebugIntentSender
    
    * commit '3f72207985a5a636d14800d0b8094c28220a8e00':
      Remove unused DebugIntentSender
  6. am 1ba0936: am 0fce612: am 7a2d8bd: am 49d502a: am c7843db: Remove un…

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    …used DebugIntentSender
    
    * commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
      Remove unused DebugIntentSender
  7. am 0fce612: am 7a2d8bd: am 49d502a: am c7843db: Remove unused DebugIn…

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    …tentSender
    
    * commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
      Remove unused DebugIntentSender
  8. am 7a2d8bd: am 49d502a: am c7843db: Remove unused DebugIntentSender

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    * commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
      Remove unused DebugIntentSender
  9. am 49d502a: am c7843db: Remove unused DebugIntentSender

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    * commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
      Remove unused DebugIntentSender
  10. am c7843db: Remove unused DebugIntentSender

    Amith Yamasani Android Git Automerger
    Amith Yamasani authored and Android Git Automerger committed Feb 5, 2014
    * commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
      Remove unused DebugIntentSender
Older
You can’t perform that action at this time.