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

144109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jungshik Jang
e2879e5977 am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev 
* commit '13dc029e32c3a8fbe1e87dfa0387ad303b0e83ba':
  Add two apis for one touch record.
 2014-07-21 12:40:15 +00:00
Ji-Hwan Lee
d6dbca92c0 am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev 
* commit '1dc7352eacde37dac5459f0bc82c868e9548b521':
  TIF: Extend multiple TV input per service for HDMI logical devices
 2014-07-21 12:40:10 +00:00
Santos Cordon
1a2b69ef00 am 5cafb03d: am e0cd9db8: Change telecomm APIs from protected to public (1/3) 
* commit '5cafb03dbcb55b50bcf81a0eea41263c25d7a9ef':
  Change telecomm APIs from protected to public (1/3)
 2014-07-21 12:40:06 +00:00
Jungshik Jang
35fb483a8f am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev 
* commit 'a86a6f2c03959cb5a2d5fbde96fdf42246ab43de':
  Do no send <Feature Abort> as response of <Feature Abort>
 2014-07-21 12:40:02 +00:00
Jinsuk Kim
b018fd8d96 am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev 
* commit 'd4a48882cca68b99cc4336257b831ccdd8ec6e6d':
  Invoke callback for HdmiControlService.deviceSelect() for internal source
 2014-07-21 12:39:58 +00:00
Joe Onorato
40f11f3d62 am 98de561e: am c35149b2: Move android.bluetooth and android.telephony to framework2.jar. 
* commit '98de561e774b78904f23bbaed1e23f12596e6ac9':
  Move android.bluetooth and android.telephony to framework2.jar.
 2014-07-21 12:39:54 +00:00
Jinsuk Kim
27da640f12 am e51029b9: am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev 
* commit 'e51029b9046dfbb15f1e72ad7a20d5959fa79ee9':
  TIF: Register IHdmiInputChangeListener to physical input manager
 2014-07-21 12:39:49 +00:00
Jesse Hall
2785e352de am c623c94c: am 65c75169: Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev 
* commit 'c623c94c0f4c823f4f33a2ce37b706277ce621bc':
  Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
 2014-07-21 12:39:45 +00:00
Santos Cordon
e9f0b379ad am 9f825c78: am 6a30817e: Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev 
* commit '9f825c78661fb95997d55748f8361ad094af93e5':
  Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)
 2014-07-21 12:39:41 +00:00
Jae Seo
a725e79325 am 0e29adb6: am bf1a0ff0: TIF: Add sendAppPrivateCommand() 
* commit '0e29adb65b8eea3092370862db329eac195bcd35':
  TIF: Add sendAppPrivateCommand()
 2014-07-21 12:39:37 +00:00
Evan Charlton
8a3807266a am 4c47b196: am e524ae5d: Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev 
* commit '4c47b19666fb15d8096979cab9bf93cdb949d280':
  @hide CAPABILITY_CALL_PROVIDER
 2014-07-21 12:39:34 +00:00
Santos Cordon
a9f5c52067 am 2f8900b1: am 829308f7: Rename InCallCall to ParcelableCall (1/2) 
* commit '2f8900b1415f142af331f8ea89833a9064a31fd9':
  Rename InCallCall to ParcelableCall (1/2)
 2014-07-21 12:39:29 +00:00
Evan Charlton
4af329b585 am c248975a: am d9e0bfee: Merge "Rename setDestroy() to destroy()" into lmp-dev 
* commit 'c248975a162abed2d1e2584ddda677d5753f9d7b':
  Rename setDestroy() to destroy()
 2014-07-21 12:39:25 +00:00
Santos Cordon
169e9e2f18 am d6afd919: am c27a00a0: Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev 
* commit 'd6afd91969f1fd9425a623144523eec2a7be0ea3':
  Change incoming call intent to a TelecommManager method. (1/3)
 2014-07-21 12:39:21 +00:00
Jean-Michel Trivi
47a0e8294b am b3c1aa30: am 1b6c240b: Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev 
* commit 'b3c1aa300beeb1ff7ab544f8d991be001bde0b0d':
  Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
 2014-07-21 12:39:17 +00:00