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

150891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
9aaf1a1c8f am 222ff70d: Merge "Inflate guts only when needed" into lmp-dev 
* commit '222ff70d04bd1e3721d455cd42ce36f046b52b93':
  Inflate guts only when needed
 2014-09-10 13:11:47 +00:00
Jorim Jaggi
c50ec62553 Merge "Inflate guts only when needed" into lmp-dev 2014-09-10 13:03:06 +00:00
Jorim Jaggi
b1cd3c1945 Inflate guts only when needed 
This saves us a ton of views.

Bug: 17346296
Change-Id: I3eafd6703d19704dc8b108c1034266f38cf77f7b
 2014-09-10 14:58:50 +02:00
Adrian Roos
c38c0e6dd2 am 500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev 
* commit '500eebbb71d64c5b4d4b6ef4ab2f10800ac455df':
  Only unbind agents of the user that is being refreshed
 2014-09-10 11:32:11 +00:00
Adrian Roos
f1fe1a3ac4 am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'be12538056cf441f441d42d2bf7d430ecdc3fd4f':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:32:07 +00:00
Adrian Roos
c727fb1fc2 Merge "Only unbind agents of the user that is being refreshed" into lmp-dev 2014-09-10 11:24:08 +00:00
Adrian Roos
f950641e28 Merge "Add system trust agents on first boot or when adding user" into lmp-dev 2014-09-10 11:23:38 +00:00
Kenny Guy
4644ccf16a am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'cefee0c8185594f017ffd396cfe1877419c24371':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:22:10 +00:00
Christoph Studer
7c6c8bc488 am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '6e68dff3deb0ec350aa769b4936e52ea00262beb':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:22:06 +00:00
Christoph Studer
990ac120df am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit 'c4290acf31f537821c42356d8a5db22afd353d1c':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:22:02 +00:00
Kenny Guy
c8824b18c1 Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 2014-09-10 11:14:59 +00:00
Christoph Studer
c8e1d78af9 Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 2014-09-10 11:14:33 +00:00
Christoph Studer
b907affce2 Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 2014-09-10 11:14:08 +00:00
Adam Connors
fb324578aa am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:16:38 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Yohei Yukawa
5318ff8bf7 am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit '107505bd85f615c82a1dca462581f8b10de72270':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:16:04 +00:00
Jessica Hummel
4eea5f821e am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '1e4efc916adb2e62f1189a6f1d8c54f8970a31f6':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:16:00 +00:00
Yohei Yukawa
f8eef09622 Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 2014-09-10 08:29:31 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
 2014-09-10 08:08:02 +00:00
Vinit Deshpande
7f8b1d3210 am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev 
* commit '8270c789682e2d10cd292ccc906ddc47df7fc1fd':
  Secure access to WifiScanner
 2014-09-10 06:58:15 +00:00
Zhijun He
7c3f8affdc am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit '5ef21e48b80876178636f3c5936c81409843ff7a':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 06:58:12 +00:00
Eric Rowe
b2a1416e2d am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev 
* commit '9c8a45b554b4af5c8a7ca959eb8d0d4d05d91ace':
  Allow protected wifi in connectivity tests
 2014-09-10 06:58:08 +00:00
Lajos Molnar
a3f86cb0c7 am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 
* commit '4f2764717bab9175eb1a22bcd770ff52d5c955f5':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
 2014-09-10 06:58:04 +00:00
Robert Shih
11a4ff854b am 3b0b5ce3: MediaPlayer/SubtitleController:fix add/select timed text on start 
* commit '3b0b5ce31f19d75ca4ea9796d4efaa1eda5e2295':
  MediaPlayer/SubtitleController:fix add/select timed text on start
 2014-09-10 06:58:00 +00:00
Yohei Yukawa
443c2bafd8 Use public APIs to instantiate InputMethodSubtype 
This is a groundwork for subsequent CLs that are
supposed to improve default input method selection
logics.

Historically we have had a @hide constructor of
InputMethodSubtype. However, this contructor is
a bit obsolete because we can not specify some
parameters that were added in recent platform
releases. We should use InputMethodSubtypeBuilder
instead.

BUG: 17347871
Change-Id: I72ad79682a58344e14380eb20e26edf98aee37cd
 2014-09-10 15:42:14 +09:00
Vinit Deshpande
a0000c6c3c Merge "Secure access to WifiScanner" into lmp-dev 2014-09-10 06:34:25 +00:00
Wink Saville
62ee07d160 Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber. 
Bug: 17255752
Change-Id: I0c792227105c6b4697b9de0e7120247795ab6641
 2014-09-09 23:20:18 -07:00
Wink Saville
d02ec8d965 Update current.txt for two renamed methods. 
getSmsManagerUsingSubId and getSubIfnoUsingSubId now have ForSubscriber
as their suffix instead of UsingSubId.

Change-Id: I1e36a4770463fd0d6a2656c3bcbbfc07bd747e01
 2014-09-09 22:43:39 -07:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Alan Viverette
0b137c763b am a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev 
* commit 'a9962d3609c2cf03ee7d437fcee2c339423da3c5':
  Improve dialog padding when title or body text are missing
 2014-09-10 03:52:10 +00:00
Eric Rowe
5fea53d085 Merge "Allow protected wifi in connectivity tests" into lmp-dev 2014-09-10 02:43:23 +00:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Eric Rowe
86e15557c5 Allow protected wifi in connectivity tests 
Change-Id: I31285572f90bfb46cc28fb04e79cb9b407477a7d
 2014-09-09 19:25:55 -07:00
Robert Shih
8c4d53c3a9 MediaPlayer/SubtitleController:fix add/select timed text on start 
- scan internal tracks when necessary
 - fix overflow in addTimedTextSource
 - do not hide timed text track in doSelectDefaultTrack; i.e. apply
   hiding logic to subtitle tracks only
 - do not notify stop in scheduleUpdate; it will be fired in onStopped
   if necessary

Bug: 17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
 2014-09-10 01:33:17 +00:00
Alan Viverette
cd7955f66c Merge "Improve dialog padding when title or body text are missing" into lmp-dev 2014-09-10 01:27:57 +00:00
Alan Viverette
e809b11bc1 Improve dialog padding when title or body text are missing 
BUG: 17446820
Change-Id: I20ace8660da90e6722e55978a3ce49eeafcd1220
 2014-09-09 18:24:52 -07:00
Eric Laurent
3af3ae2ee4 am 4f0149fe: Merge "SoundTriggerHelper: handle media server death" into lmp-dev 
* commit '4f0149fe3d4057b61f7df77820ef6df0bd2cfbb7':
  SoundTriggerHelper: handle media server death
 2014-09-10 01:01:07 +00:00
Junda Liu
7100d15a99 am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument. 
* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
  Add ForSubscriber suffix to APIs w/ subId argument.
 2014-09-10 01:00:59 +00:00
Eric Laurent
0fd9d8a2c8 Merge "SoundTriggerHelper: handle media server death" into lmp-dev 2014-09-10 00:53:00 +00:00
Dianne Hackborn
bb5bde9388 am 829b79f6: Merge "Fix build." into lmp-dev 
* commit '829b79f67a23f89e994ea720cd0c4a146f57ba5f':
  Fix build.
 2014-09-10 00:50:48 +00:00
Junda Liu
13e28bb938 Add ForSubscriber suffix to APIs w/ subId argument. 
Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
 2014-09-09 17:50:09 -07:00
Dianne Hackborn
d5adbec527 Merge "Fix build." into lmp-dev 2014-09-10 00:40:55 +00:00
Dianne Hackborn
f5cc3644f6 Fix build. 
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
 2014-09-09 17:38:34 -07:00
Amit Mahajan
f56d2b4bfc am 7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev 
* commit '7cd6fc5b838fde5046028518cee44d8fd69cc701':
  Support to load default voicemail number from the configuration.
 2014-09-10 00:29:01 +00:00
wsmlby
e9593a9773 am d1ed1e81: Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev 
* commit 'd1ed1e81df51543cd1ab45170f12f2ed615f770d':
  Fix AppCompatibility test for different process name of one package.
 2014-09-10 00:28:58 +00:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo 
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
 2014-09-09 17:27:26 -07:00
Eric Laurent
2475e38c10 SoundTriggerHelper: handle media server death 
Retry to attach sound trigger module when startRecognition() is called.

Bug: 17373746.
Change-Id: I5b2f806b6cab47741d345be1cde73a84f5a62590
 2014-09-09 17:26:00 -07:00
Jinsuk Kim
68cbd6abb6 am a8c43b25: Merge "CEC: Stub MHL Controller" into lmp-dev 
* commit 'a8c43b254104ead2c465544efb88ec8de6f9f462':
  CEC: Stub MHL Controller
 2014-09-10 00:24:48 +00:00
Amit Mahajan
f14fb34292 Merge "Support to load default voicemail number from the configuration." into lmp-dev 2014-09-10 00:23:50 +00:00