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

144128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
fef0011144 am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:11:42 +00:00
Ricardo Cervera
d73eb7f9c9 am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:07:00 +00:00
Derek Sollenberger
51169fa033 am 9a27e8f2: am 1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev 
* commit '9a27e8f2915f1f367d24fbb0455f7e5b873d74d2':
  Remove invalid SkASSERT that prevents us from running with SK_DEBUG
 2014-07-21 17:05:30 +00:00
Yorke Lee
488d3f5f4b am b9105f15: am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev 
* commit 'b9105f15aa914fcbc10cf414edf2a79ab23c403c':
  Add call log entries to all currently running users
 2014-07-21 17:05:27 +00:00
Derek Sollenberger
c784ce0fb5 am 1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev 
* commit '1bf087a904aaa7b4fbd7302600f1cbd98e540855':
  Remove invalid SkASSERT that prevents us from running with SK_DEBUG
 2014-07-21 17:01:19 +00:00
Yorke Lee
0d6b31426b am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev 
* commit 'ec0197dae050d48b803b803b082d619925306fc0':
  Add call log entries to all currently running users
 2014-07-21 17:01:15 +00:00
Derek Sollenberger
e1bb46bd7f am 61cc70a2: am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev 
* commit '61cc70a2c21e32c6e6d0f0c909c85bf8b1095d3e':
  Separate Canvas JNI code from the implementation.
 2014-07-21 16:49:23 +00:00
Derek Sollenberger
22c0fc66b0 am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev 
* commit '521830a79ba1e56429b31607a4c5af990cd76542':
  Separate Canvas JNI code from the implementation.
 2014-07-21 16:45:15 +00:00
Robert Ly
c16f3f6354 am d93a4d1b: am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit 'd93a4d1bae3713a518b3b3bc7ddcfe4f22b8994c':
  docs: change copy for edu video
 2014-07-21 16:30:06 +00:00
Robert Ly
acee769c0b am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit '077d56225b53ef152474e0aed27fe4010139fe01':
  docs: change copy for edu video
 2014-07-21 16:26:43 +00:00
Robert Ly
fb06b4800c am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit '205196f128b13eecea2789506341c7ecd2044b71':
  docs: change copy for edu video
 2014-07-21 16:22:12 +00:00
Robert Ly
205196f128 am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
  docs: change copy for edu video
 2014-07-21 16:17:39 +00:00
Robert Ly
efca30d0fa am 62c81ab5: docs: change copy for edu video 
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
  docs: change copy for edu video
 2014-07-21 16:11:39 +00:00
Adrian Roos
3a6bebf38d am 4f5106e7: am c1c28902: More user switching goodness 
* commit '4f5106e7a69d2c4893e7b7492948ab377682a8be':
  More user switching goodness
 2014-07-21 16:09:27 +00:00
Robert Ly
62c81ab580 docs: change copy for edu video 
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
 2014-07-21 09:06:50 -07:00
Adrian Roos
a08d5acf33 am c1c28902: More user switching goodness 
* commit 'c1c28902038844c608d06692df74b2886d41fc6f':
  More user switching goodness
 2014-07-21 16:04:49 +00:00
Adrian Roos
5005244f10 More user switching goodness 
- Confirmation when exiting guest
- Dialog when resuming existing guest session (will be HUNed in follow-up CL)
- Properly center user name in QS user switcher

Bug: 15759638
Bug: 16378966
Change-Id: I63a1dd524975408618c10d90a18052f15deec756
 2014-07-21 15:54:03 +00:00
Deepanshu Gupta
0ca0853c52 Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev 2014-07-21 15:43:35 +00:00
Deepanshu Gupta
c54100d449 Update layoutlib create README [DO NOT MERGE] 
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.

Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
(cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)
 2014-07-21 17:37:20 -07:00
Amith Yamasani
b74a7babaa Merge "Fix a security exception when checking cross-profile caller-id cap." into lmp-dev 2014-07-21 15:43:35 +00:00
Amith Yamasani
eee5094f96 Fix a security exception when checking cross-profile caller-id cap. 
No need to enforce that the caller is in the system process.
We're only checking if the device policy is allowing access.

Bug: 16301261
Change-Id: I87a7c808d116c86aa68cebb36631c46d0a54be96
 2014-07-21 17:04:44 -07:00
Adam Lesinski
775ded1a91 Merge "Change UsageStatsService to check uses-permission" into lmp-dev 2014-07-21 15:43:35 +00:00
Adam Lesinski
53ab92d890 Change UsageStatsService to check uses-permission 
Have UsageStatsService check permission grants when AppOps
returns the default MODE_IGNORED mode for a package.

Change-Id: I784a708451a56863b13fc5f178e10bba6ce37a2f
 2014-07-21 13:20:25 -07:00
Ricardo Cervera
940ae93043 Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 2014-07-21 15:43:35 +00:00
Ricardo Cervera
448525e98e docs: Added note suggesting use of Android Studio over ADT 
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
 2014-07-21 09:08:10 -07:00
Jean-Michel Trivi
0d964e77b9 Merge "Unhide SoundPool builder with AudioAttributes" into lmp-dev 2014-07-21 15:42:19 +00:00
Jean-Michel Trivi
fb52139bd8 Unhide SoundPool builder with AudioAttributes 
Change-Id: I9ec6ca310a342f72cc1a0de5d93fe650b0ca2125
 2014-07-21 16:00:43 -07:00
Andrew Solovay
643fa8d1ec Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 2014-07-21 15:42:19 +00:00
Jean-Michel Trivi
79bf7284b9 Merge "New MediaFormat keys for AAC" into lmp-dev 2014-07-21 15:42:19 +00:00
Jean-Michel Trivi
a8a3f55865 New MediaFormat keys for AAC 
Decoder:
    KEY_AAC_DRC_ATTENUATION_FACTOR
    KEY_AAC_DRC_BOOST_FACTOR
    KEY_AAC_DRC_HEAVY_COMPRESSION
    KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
    KEY_AAC_ENCODED_TARGET_LEVEL
    KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT
Encoder:
    KEY_AAC_SBR_MODE

Change-Id: I69abe01add135875446914134d93a58815992e07
 2014-07-21 16:47:34 -07:00
Alan Viverette
340c98cae8 Merge "Always apply surface insets" into lmp-dev 2014-07-21 15:42:19 +00:00
Alan Viverette
ac89416c77 Always apply surface insets 
Change-Id: I9d8ad0c7fcf7a1016e01c2332f45614da5d2cf0c
 2014-07-21 12:10:30 -07:00
Craig Mautner
2cfeb1ac39 Merge "Don't create a delegate for null callbacks." into lmp-dev 2014-07-21 15:42:19 +00:00
Craig Mautner
3d0c57a1d3 Don't create a delegate for null callbacks. 
ActivityView does not create callbacks for the VirtualDisplay. This
leads to setting Looper.myLooper() from a Binder thread which
leads to NPE when trying to dereference its message queue.

Fixes bug 16386002.

Change-Id: I12760a22075ed4770f3fe960763e0135fe095cfe
 2014-07-21 14:33:47 -07:00
destradaa
facc7bce1b Merge "Update GPS HAL raw measurements support." into lmp-dev 2014-07-21 15:42:19 +00:00
destradaa
2102dd7255 Update GPS HAL raw measurements support. 
Align the GPS framework with the GPS HAL
b/16374800

Remove localTime field from API
b/16241708

Update Property containers for measurements to use bit masks
b/16238371

Change-Id: Id4db16c3153d0020bf2edb5a67f59353662762d0
 2014-07-21 10:38:12 -07:00
Adam Powell
33a234b3b0 Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev 2014-07-21 15:42:19 +00:00
Craig Mautner
1716baa6d3 Merge "Rename flag and attribute per API council" into lmp-dev 2014-07-21 15:42:19 +00:00
Craig Mautner
7f72f53704 Rename flag and attribute per API council 
ActivityInfo.DO_NOT_PERSIST => PERSIST_NEVER.
android:persistableMode="doNotPersist" => "persistNever".

Fixes bug 16400594.

Change-Id: I94d25f7d2e3dc453b1251c89bce8c210a65dc331
 2014-07-21 10:07:12 -07:00
Craig Mautner
38c1a5f5a9 am b7bb95b0: am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead" 
* commit 'b7bb95b0f3cd8b2ccb61cfa75a586fe1df1be123':
  Skip broadcasting to a receiver if the receiver seems to be dead
 2014-07-21 15:36:37 +00:00
Craig Mautner
b7bb95b0f3 am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead" 
* commit '02fd104f303cb7d55d6af42be8fe7be543e9aba5':
  Skip broadcasting to a receiver if the receiver seems to be dead
 2014-07-21 15:31:38 +00:00
Dan Sandler
5854500459 am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos. 
* commit '00c3f554f17f0a82f0feca9013de804426c149de':
  Defend against null ApplicationInfos.
 2014-07-21 13:21:57 +00:00
Dan Sandler
7505947b6c am 8bfa8dbc: Defend against null ApplicationInfos. 
* commit '8bfa8dbccfa178344485450be8b388efcc29d88d':
  Defend against null ApplicationInfos.
 2014-07-21 13:17:23 +00:00
Dan Sandler
09afc2e4ea Defend against null ApplicationInfos. 
Bug: 16303792
Change-Id: Id2d7a70f92718ecda8e3ff418c4e109f6982a75f
 2014-07-21 13:11:17 +00:00
Wonsik Kim
f8f1c49e7a am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev 
* commit '39ac147e42ccaf1fc5450fc81572231a7e6b3449':
  TIF: fix indexOfValue usage
 2014-07-21 13:05:03 +00:00
Wonsik Kim
ae0ee247ed am caed0312: am acbd8d4a: Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev 
* commit 'caed03128dec1dd521a9ca1ed19ff60f89d8d868':
  TIF: fix tvInputType attribute to match with TvInputInfo
 2014-07-21 13:04:59 +00:00
Wonsik Kim
0b9a52cfb3 am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev 
* commit '20c790cf711b4930f24eb031c4a5839aeb1a441f':
  TIF: fix indexOfValue usage
 2014-07-21 13:01:06 +00:00
Wonsik Kim
5ee9fa5f4f am acbd8d4a: Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev 
* commit 'acbd8d4a6cc0d256980897cfe641ab6bb66ae6bb':
  TIF: fix tvInputType attribute to match with TvInputInfo
 2014-07-21 13:01:02 +00:00
Adrian Roos
3f5d82bb8d am 35e21d40: am a727db86: Update LockPatternUtils to new alarm API 
* commit '35e21d40ee1f219d9e44654ffdadf96bf85f69c7':
  Update LockPatternUtils to new alarm API
 2014-07-21 12:40:23 +00:00
Niels Egberts
bf471288c1 am 1eb446a5: am 7a925857: New TtsSpan builders for money, electronic and telephone. 
* commit '1eb446a5e0636d3269a667007c3bb64596263d56':
  New TtsSpan builders for money, electronic and telephone.
 2014-07-21 12:40:19 +00:00