drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,739 Commits 1 Branch 0 Tags
Commit Graph

170739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
7a69c2de12 docs: debugging studio [CP] 
Change-Id: I1ef8c954d780e7283bb91c16a84dc727be42f9ab
(cherry picked from commit 91635522acc906c69ae94c7d3c6efb8e2e0a2bd2)
 2014-12-06 09:16:10 +00:00
Rich Slogar
cc4d08b4ae docs:setting up hardware devices [CP] 
Change-Id: I3a04df7b70bf8e389361e3c333e62a639a70d36e
(cherry picked from commit daaa16403fbd82406535367c528ff8757e111b06)
 2014-12-06 09:15:04 +00:00
Rich Slogar
d16db79ed8 docs: workflow index [CP] 
Change-Id: I4b3004696698c4f15109373eda684fe0143dd7d6
(cherry picked from commit 8f524103d8d93033d80fcb95d30e4d7f5ab51bcc)
 2014-12-06 09:10:14 +00:00
Scott Rowe
1efca60b03 am e829d8fc: docs: Training refactor for Android Studio [CP] 
* commit 'e829d8fca68c1e5da6a97d07b051f3b8de2e2622':
  docs: Training refactor for Android Studio [CP]
 2014-12-06 09:04:05 +00:00
Rich Slogar
5e8d9a024e docs: tools help update [CP] 
Change-Id: Ida8d313e0439c64fd3f272513d053f44701e22be
(cherry picked from commit b858db5ba746c370424028814a20c8902e678433)
 2014-12-06 08:59:16 +00:00
Scott Rowe
e829d8fca6 docs: Training refactor for Android Studio [CP] 
Cherrypick from lmp-docs hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612

Change-Id: I09a9473d73eb9c27ee6966b2a0e1cd736575db06
(cherry picked from commit 8c068aeee06efd2ce0827c81e5919e90358c56e3)
 2014-12-06 08:55:21 +00:00
David Friedman
cac94aa079 am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d. 
* commit '06e922fce84577598d69ee47705203a553a20384':
  Fixes (updates) download links for NDK r10d.
 2014-12-06 08:47:14 +00:00
David Friedman
06e922fce8 am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d. 
* commit 'cf528ec72f8fcacbbdbfc283371af507a7d05ece':
  Fixes (updates) download links for NDK r10d.
 2014-12-06 08:38:59 +00:00
David Friedman
cf528ec72f am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d. 
* commit 'd56f55defe64fe692d945c9b9252ed7d63588026':
  Fixes (updates) download links for NDK r10d.
 2014-12-06 08:30:03 +00:00
David Friedman
d56f55defe am caacc895: Fixes (updates) download links for NDK r10d. 
* commit 'caacc895d7749cd0b2df6f6420b07ceaece21d83':
  Fixes (updates) download links for NDK r10d.
 2014-12-06 08:21:14 +00:00
David Friedman
caacc895d7 Fixes (updates) download links for NDK r10d. 
Change-Id: I277224da7ef0c3a0ad3c2223222912e400a41546
 2014-12-06 00:09:37 -08:00
Jeff Davidson
5b8c5dd41e am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev 
* commit '699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
 2014-12-06 02:10:54 +00:00
Jeff Davidson
386effc7a1 am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit 'f779e6b8ac827d923e3e7905045ad5c35512c535':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-06 02:10:49 +00:00
Jeff Davidson
401ef259f3 am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev 
* commit 'a4144563a5bd0e0be4a97fa6e89be6fb455da372':
  add disable Ephemeral Network API Bug:18525241
 2014-12-06 02:10:39 +00:00
Jeremy Joslin
c4b2ec1a3a am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit '1edc73aa5dc24db39ec685f1950c5110699e301e':
  Don't send the same PendingIntent more than once.
 2014-12-06 02:10:33 +00:00
Jeff Davidson
699faa1d8c Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev 2014-12-06 02:07:00 +00:00
Jeff Davidson
f779e6b8ac Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 2014-12-06 02:06:50 +00:00
Jeff Davidson
a4144563a5 Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev 2014-12-06 02:06:12 +00:00
Jeremy Joslin
1edc73aa5d Merge "Don't send the same PendingIntent more than once." into lmp-mr1-dev 2014-12-06 02:05:22 +00:00
Evan Charlton
068a078645 am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev 
* commit '59dac0e192a920682d42e2da395fb3fa62f4fdc4':
  Associate a UserHandle with each PhoneAccountHandle
 2014-12-06 01:52:56 +00:00
Evan Charlton
59dac0e192 Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev 2014-12-06 01:45:12 +00:00
Paul Jensen
a4afe13af3 am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit '891dd5743af17e3376b0b0438b149c565cf871c8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-06 01:31:32 +00:00
Paul Jensen
891dd5743a Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 2014-12-06 01:23:56 +00:00
Jeff Davidson
f9fff92d70 Fix flipped captive portal bit in network conditions bcast. 
Bug: 18651036
Change-Id: I191fcafab1fc5ba65be06359da1edc7ca5aabc6a
 2014-12-05 16:56:08 -08:00
Jeff Tinker
b15a57d64d am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev 
* commit '82cc1c5a2d279bce4d4ce83a68613633f9ff8be2':
  Unhide secure stop APIs
 2014-12-06 00:34:05 +00:00
Jeff Tinker
82cc1c5a2d Merge "Unhide secure stop APIs" into lmp-mr1-dev 2014-12-06 00:28:26 +00:00
Jinsong Mu
6fac0351ce am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 
* commit 'b3898fbe07b488ba15d696be9d00ccfac66a6a77':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-05 23:54:00 +00:00
Ihab Awad
2b45554454 am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '6a1c82564f6b5e48928f9ff8023c8aed41d78a3a':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-05 23:53:54 +00:00
Jinsong Mu
b3898fbe07 Merge "Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 2014-12-05 23:50:02 +00:00
Ihab Awad
6a1c82564f Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 2014-12-05 23:46:19 +00:00
Jeff Tinker
846e712dc7 Unhide secure stop APIs 
Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c
related-to-bug: 18053197
related-to-bug: 18076411
 2014-12-05 15:44:17 -08:00
David Friedman
7823e6ee90 am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit '968ef51c679105df4770a2d04b506a7f5ffacaf8':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:34:20 +00:00
David Friedman
968ef51c67 am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit 'c305e6eb4aacf08001241ce18e0a86ba369fd421':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:27:27 +00:00
Ihab Awad
0855e7aea2 Add Text-to-Speech annotations for phone number displays (1/3) 
Bug: 17321294
Change-Id: Id7e48e683694e2f9ea2a7dd7fa7d69acc727489d
 2014-12-05 15:27:08 -08:00
RoboErik
2d7a1b09e9 am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit 'd386d0f391c41e3e6e87abab44600df24f45ac4a':
  Route mute key events through MediaSessionService
 2014-12-05 23:23:59 +00:00
David Friedman
c305e6eb4a am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit '860bdc7d5e4f5a6e065e5c66c1e25fcca7fe5f27':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:20:00 +00:00
RoboErik
d386d0f391 Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 2014-12-05 23:16:41 +00:00
David Friedman
860bdc7d5e am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit 'b357f74e5163d5e4e322302055d053e99e29f60f':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-05 23:12:12 +00:00
David Friedman
b357f74e51 Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 2014-12-05 23:04:58 +00:00
Quddus Chong
e6000f4753 am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit '52fec4707ddfd7e2b2e8f7459635d4d48fe9b30a':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-05 23:01:33 +00:00
Quddus Chong
f428952e09 am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit '9deffeccfe06587a09a0ca42cab1c53ff46d887f':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-05 23:01:16 +00:00
Wale Ogunwale
80d119121f am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev 
* commit 'b503e3f2872636b450d950b5792fdb569d87819c':
  Don't destroy surfaces of activities launched behind early.
 2014-12-05 23:01:11 +00:00
Filip Gruszczynski
91a5dd9b43 am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 
* commit 'e6a2ff2b1f7a2241350347fd0f12ffccc1391649':
  Fix calculation of overscan insets in WindowState.
 2014-12-05 23:01:06 +00:00
Dianne Hackborn
e52a2ea03b am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit '0029f0ac36c28b60d59d3d70d148ba3136971b95':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-05 23:01:01 +00:00
Quddus Chong
52fec4707d am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit 'f7b51977490f0951dead8e81bc09dae2d546ac65':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-05 22:58:30 +00:00
Quddus Chong
9deffeccfe am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit '15c3ce77fd8eccef01f1c0671485fcc20c4c6e9c':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-05 22:58:24 +00:00
Jeremy Joslin
7929484dbf Don't send the same PendingIntent more than once. 
Fixing a bug where a NetworkRequest's PendingIntent can be sent more
than once when networks are rematched before the intent completes.

Added a small delay before removing the request to give the receiving
client an opportunity to put in its own request. The delay value is
configurable via Settings.Secure.

Bug: 18614074
Change-Id: Iac7c5e5a04f42f2b6794e9e22349cc631bebeab7
 2014-12-05 14:58:04 -08:00
vandwalle
93e4192c06 add disable Ephemeral Network API 
Bug:18525241

Change-Id: I954c53c55c39f6c376b2bae3c7ac4d28246a7f5a
 2014-12-05 14:56:43 -08:00
Wale Ogunwale
b503e3f287 Merge "Don't destroy surfaces of activities launched behind early." into lmp-mr1-dev 2014-12-05 22:56:13 +00:00
Filip Gruszczynski
e6a2ff2b1f Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 2014-12-05 22:56:00 +00:00