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

177505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
024b3555a8 am a5155276: (-s ours) am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP] 
* commit 'a51552768bfab83b68f1e7310c3660ec905d16c3':
  docs:download updates for studio [CP]
 2014-12-09 13:21:38 +00:00
Rich Slogar
da66b8fb2c am da5184e2: (-s ours) am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates 
* commit 'da5184e2dc44b04fb54619b487e56f8b9bdb8638':
  docs:revision updates
 2014-12-09 11:30:05 +00:00
Lajos Molnar
77d3489ac7 am 3547de2f: am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate" 
* commit '3547de2f15310c266ab0cc35736cfc5a11950f60':
  media: fix isSupportedFormat for integer frame rate
 2014-12-09 11:25:28 +00:00
Lajos Molnar
bbd58d88f0 am f5375fbd: am 38935e6e: Merge "media: allow full range of Vorbis sampling rates" 
* commit 'f5375fbd8ef47f9c285ec2ccf857d673ed15d30d':
  media: allow full range of Vorbis sampling rates
 2014-12-09 11:25:22 +00:00
Narayan Kamath
8ff1a5ee0d am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc." 
* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
  Fix PhoneStateListener constructor javadoc.
 2014-12-09 11:25:04 +00:00
Przemyslaw Szczepaniak
735c31c344 Merge "Add UtteranceProgressListener#onStop callback" 2014-12-09 11:13:44 +00:00
Wonsik Kim
6573fd535e am a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev 
* commit 'a565716a2a26c7522dabfb28f646508cc1928053':
  TIF: TvInputHardwareManager to listen to volume changes
 2014-12-09 11:06:16 +00:00
Jean-Michel Trivi
b3f390fe86 am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev 
* commit '83d0c86b869fe84b3172028a5598ebd87ce7745b':
  Support collaborative audio focus handling
 2014-12-09 11:06:11 +00:00
Rich Slogar
404f602fa7 am 458a3b8a: am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your first app [CP] 
* commit '458a3b8afdd0f152902d4930f9fa22bf226b6227':
  docs:building your first app [CP]
 2014-12-09 11:06:07 +00:00
Przemyslaw Szczepaniak
4b73867a12 Add UtteranceProgressListener#onStop callback 
New UtteranceProgressListener callback that allows
to detect a call to TextToSpeech#stop() (or QUEUE_FLUSH usage)
from the same client, or a QUEUE_DESTROY usage from any other
client (Talkback uses it to preempt other users of TextToSpeech
queue). This change is required for seamless Books read aloud
feature+Talkback usage.

+ Fixes for broken tests/TtsTests

Bug: 17901521

Change-Id: I30d2f297bb7c8d05cbeb16f63e85c1be0cca5c84
 2014-12-09 11:06:06 +00:00
smain@google.com
e856fb7ae4 am 6eef2c3a: am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP] 
* commit '6eef2c3a44017069c5d50a469549cd1fce0c447c':
  docs: project updates [CP]
 2014-12-09 11:06:02 +00:00
smain@google.com
9a573a430a am 7e6713fc: am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP] 
* commit '7e6713fc080d70721cd33d088f23fa66afcde12f':
  docs: setup-virtual-device [CP]
 2014-12-09 11:05:56 +00:00
Rich Slogar
8e1bd15a7c am b5c81893: am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP] 
* commit 'b5c81893e781aa8e11d59b027f2fa4884b700ad6':
  docs support library updates [CP]
 2014-12-09 11:05:51 +00:00
Rich Slogar
067736807e am cdad9919: am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP] 
* commit 'cdad9919ced52b1f7bd00ee442ee97e9c0fd397b':
  docs: debugging studio [CP]
 2014-12-09 11:05:44 +00:00
Rich Slogar
650d4df87b am 059b6ef3: am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP] 
* commit '059b6ef35c90706ba2a37b69f77abff200b97243':
  docs:setting up hardware devices [CP]
 2014-12-09 11:05:39 +00:00
Rich Slogar
acee3b63a4 am 44176d92: am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP] 
* commit '44176d92e0b65a9cc88a4a4d3d7b52278a22a73c':
  docs: workflow index [CP]
 2014-12-09 11:05:34 +00:00
Rich Slogar
36595d2628 am 0622234b: am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP] 
* commit '0622234bcc5ec27d3f57b674f98f607c101d9f4a':
  docs: tools help update [CP]
 2014-12-09 11:05:29 +00:00
Scott Rowe
3e885e3fa0 am 46f7dcf1: (-s ours) am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP] 
* commit '46f7dcf1e41c1f4fa8477b184dd3d775070220a0':
  docs: Training refactor for Android Studio [CP]
 2014-12-09 11:05:24 +00:00
Sebastien Hertz
70acd9b36a resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
 2014-12-09 10:16:46 +01:00
Mark Lu
4b5a9a09e5 [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked. 
Symptom:
in .ActivityStack.resetTargetTaskIfNeededLocked,  "allowTaskReparenting" if case will call setTask
to remove activities from task, that will caused numActivities in main for-loop not consist with task.mActivities size.
caused NPE will happend in finish activities for-loop due to get null object from activities when clearWhenTaskReset" as true case.

Root Cause:
when clearWhenTaskReset as true, will set "end" variable as numActivities -1, but if calling setTask to remove activities from task,
end value will out of date & not same with task.mActivities size.

Solution:
use activities.size() - 1 to assign end value.

Change-Id: I5d7fe22e1df2fc61738db23402e7c42cf6d8c4cc
 2014-12-09 06:48:21 +00:00
Elliott Hughes
0adcf15ad8 Fix typo. 
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
 2014-12-08 20:50:00 -08:00
Mike Lockwood
ae13230b87 Merge "MIDI: API changes to support multiple ports per device" 2014-12-09 02:37:40 +00:00
Mathieu Chartier
7a811fc7f2 am fb5c932d: Merge "Add more -d dalvik details to dumpsys" 
* commit 'fb5c932dbbe2e7fc3ed4f0af71dc8ac76f22df57':
  Add more -d dalvik details to dumpsys
 2014-12-09 02:25:45 +00:00
Mathieu Chartier
fb5c932dbb Merge "Add more -d dalvik details to dumpsys" 2014-12-09 02:05:45 +00:00
Dianne Hackborn
beb84982a1 am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 01:57:26 +00:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode 
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
 2014-12-08 17:43:31 -08:00
Mathieu Chartier
e417db6d57 am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:43:00 +00:00
Pavel Zhamaitsiak
963db3fa69 am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev 
* commit 'c67da06df74095e44ecf9449216563b622927463':
  IMS: start and stop dtmf tones.
 2014-12-09 01:42:53 +00:00
Mathieu Chartier
063028aa68 Add more -d dalvik details to dumpsys 
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)
 2014-12-08 17:33:56 -08:00
Mathieu Chartier
4ec1bdf52f am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '52070f81f2c4c41ffe74adcabda64c2b0349c62d':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:31:11 +00:00
Pavel Zhamaitsiak
c67da06df7 am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev 
* commit '0f78ad87f09b2230fc9e472a6cb412c560bdbd4f':
  IMS: start and stop dtmf tones.
 2014-12-09 01:31:05 +00:00
Mathieu Chartier
52070f81f2 Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 2014-12-09 01:24:52 +00:00
Pavel Zhamaitsiak
0f78ad87f0 Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev 2014-12-09 01:24:46 +00:00
Mike Lockwood
b6b9a91c02 MIDI: API changes to support multiple ports per device 
Add MidiInputPort and MidiOutputPort classes (with MidiPort base class)
A MidiDevice can now have multiple input and output ports.
Multiple ports are currently supported only for virtual devices, USB support coming later.

Change-Id: Ib55076aa1374aa46ae4ae76ad93bd717df6d7e21
 2014-12-08 17:09:14 -08:00
Jinsuk Kim
7822e6437a am 62bb43db: am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 
* commit '62bb43dbec930b7a4dc2272d8ed4da73d9aef8b1':
  CEC: Avoid setting op in disabled mode
 2014-12-09 01:00:50 +00:00
David Friedman
cf7f964999 am 587d349e: am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d. 
* commit '587d349eff8c19ee8380cb4dc2751608986d7e83':
  Fixes (updates) download links for NDK r10d.
 2014-12-09 01:00:45 +00:00
Jeff Davidson
01b43ded9b am 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev 
* commit '5550a408c4b9a530674a1766875f272e46a1e1fb':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
 2014-12-09 01:00:40 +00:00
Jeff Davidson
4520f656f1 am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit '0efd29fc57c7369e2371aa3226e90f97331f517a':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-09 01:00:34 +00:00
Jeff Davidson
5d0bf5de0d am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev 
* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
  add disable Ephemeral Network API Bug:18525241
 2014-12-09 01:00:29 +00:00
Jeremy Joslin
902cc578a4 am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit 'd4753450f37d88fec11d1405250529ca794ae70c':
  Don't send the same PendingIntent more than once.
 2014-12-09 01:00:09 +00:00
Evan Charlton
d4f3f8b81a am 1b001cae: am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev 
* commit '1b001caed3f2ee150850830dba371f13d61d5512':
  Associate a UserHandle with each PhoneAccountHandle
 2014-12-09 01:00:04 +00:00
Paul Jensen
64a3ba3f2e am 446a59bc: am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit '446a59bc26ffab59e05bb0967bb27758170dbcf5':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-09 01:00:00 +00:00
Jeff Tinker
6d4c6db5cf am f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev 
* commit 'f062d8d7df6b6ca72f103d133a3483cd91c95c60':
  Unhide secure stop APIs
 2014-12-09 00:59:55 +00:00
Jinsong Mu
0de9745c20 am 5a181a24: am 6fac0351: 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 '5a181a2436fb629c2298b9bfb0b2848b514edbe6':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-09 00:59:45 +00:00
Ihab Awad
88bf9bcb49 am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '657f25e9641e7c546032adf90b9c4bdaef36eab9':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-09 00:59:40 +00:00
David Friedman
5f156f9f95 am ad9e0d5e: am 7823e6ee: 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 'ad9e0d5ed57d9d32074566e6da400d1a7313236a':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-09 00:59:34 +00:00
RoboErik
9053ce8c20 am b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit 'b22eea724b4f1d1ccbb1fd7ddd2eb3d9eb3204c8':
  Route mute key events through MediaSessionService
 2014-12-09 00:59:30 +00:00
Quddus Chong
bfa063b6fd am 0d9d5d0a: am e6000f47: 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 '0d9d5d0a838a5eaea6c5915358ee089b9ae0e45e':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-09 00:59:23 +00:00
Quddus Chong
754c62ab43 am a40c6b04: am f428952e: 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 'a40c6b0479c9fbc738aeb04c0cd585d00d6ba9c5':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-09 00:59:17 +00:00