Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,457 Commits 3 Branches 0 Tags
935080433fd2ceabd6027fbb5de30fa2c29227ce
Commit Graph

152457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhijun He
935080433f am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit '5ef21e48b80876178636f3c5936c81409843ff7a':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 07:01:25 +00:00
Eric Rowe
24d0a48813 am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev 
* commit '9c8a45b554b4af5c8a7ca959eb8d0d4d05d91ace':
  Allow protected wifi in connectivity tests
 2014-09-10 07:01:20 +00:00
Lajos Molnar
32de07753f 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 07:01:15 +00:00
Robert Shih
171bae3320 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 07:01:09 +00:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +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
Alan Viverette
ec2cef46c2 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 01:36:29 +00: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
1695b30736 am 4f0149fe: Merge "SoundTriggerHelper: handle media server death" into lmp-dev 
* commit '4f0149fe3d4057b61f7df77820ef6df0bd2cfbb7':
  SoundTriggerHelper: handle media server death
 2014-09-10 01:01:33 +00:00
Junda Liu
12152a0319 am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument. 
* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
  Add ForSubscriber suffix to APIs w/ subId argument.
 2014-09-10 01:01:24 +00:00
Eric Laurent
0fd9d8a2c8 Merge "SoundTriggerHelper: handle media server death" into lmp-dev 2014-09-10 00:53:00 +00:00
Dianne Hackborn
27d5e078f4 am 829b79f6: Merge "Fix build." into lmp-dev 
* commit '829b79f67a23f89e994ea720cd0c4a146f57ba5f':
  Fix build.
 2014-09-10 00:50:12 +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
da3a6a9e2d 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:11 +00:00
wsmlby
f819e35b2f 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:29:06 +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
Amit Mahajan
f14fb34292 Merge "Support to load default voicemail number from the configuration." into lmp-dev 2014-09-10 00:23:50 +00:00
Jinsuk Kim
a8e0c1d0b2 am a8c43b25: Merge "CEC: Stub MHL Controller" into lmp-dev 
* commit 'a8c43b254104ead2c465544efb88ec8de6f9f462':
  CEC: Stub MHL Controller
 2014-09-10 00:22:40 +00:00
wsmlby
e12c6f7d54 Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev 2014-09-10 00:21:27 +00:00
Jinsuk Kim
109526fe4f Merge "CEC: Stub MHL Controller" into lmp-dev 2014-09-10 00:16:15 +00:00
Robert Ly
847e181ce6 am bb6ede49: am 0cb4c738: am 9f60bc3f: am 52a18161: docs: update api dashboard for september 
* commit 'bb6ede49f4378feb261a577a74ee0532a9b3f4f0':
  docs: update api dashboard for september
 2014-09-10 00:12:43 +00:00
Xia Ying
b9515f9c44 Support to load default voicemail number from the configuration. 
If there is no preload VM number in the sim card, carriers such as
Verizon require to load a default vm number from the configurantion.
Define config_default_vm_number for this purpose. And there are two
optional formats for this configuration, example as below:
(1)<item>voicemail number</item>
(2)<item>voicemail number;gid</item>

Bug: 17209959
Change-Id: Ia4e78ad7265e73bb4e4a823dbaeb606935d39f46
 2014-09-10 00:11:23 +00:00
Robert Ly
fb04057bf6 am 0cb4c738: am 9f60bc3f: am 52a18161: docs: update api dashboard for september 
* commit '0cb4c738fba92671dc3a1a75917259f09532a9e4':
  docs: update api dashboard for september
 2014-09-10 00:02:31 +00:00
Jeff Tinker
959c27f95d am 50bb6215: Merge "Add support for max-res decode" into lmp-dev 
* commit '50bb621501fafc85be31e2039a43e6bbe93344bd':
  Add support for max-res decode
 2014-09-10 00:02:17 +00:00
Adam Lesinski
325820e197 am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '38bd55ffd7084d744e4e814593056e1e12ebfb00':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-09 23:56:38 +00:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Robert Ly
0cb4c738fb am 9f60bc3f: am 52a18161: docs: update api dashboard for september 
* commit '9f60bc3f129037f2f1b05a09902c8e97d66322f3':
  docs: update api dashboard for september
 2014-09-09 23:51:10 +00:00
Adam Lesinski
732edf098f Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* changes:
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-09 23:50:04 +00:00
Robert Ly
9f60bc3f12 am 52a18161: docs: update api dashboard for september 
* commit '52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
  docs: update api dashboard for september
 2014-09-09 23:40:51 +00:00
Tsuwei Chen
16935e2f3a am 5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev 
* commit '5675ab1b691f2dc2b94bbdd78bbdbba90896cb01':
  Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144
 2014-09-09 23:34:44 +00:00
Tsuwei Chen
98ff7bce66 Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev 2014-09-09 23:29:14 +00:00
Robert Ly
52a1816180 docs: update api dashboard for september 
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
 2014-09-09 16:28:08 -07:00
Adam Lesinski
99d0ad0dff am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev 
* commit '799dc7483f6c6a4b554f2a3dad4b801371347cea':
  AAPT: Don't crash on illegal symbol name
 2014-09-09 23:25:02 +00:00
Zhijun He
b67c3102c9 CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P 
Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
 2014-09-09 16:19:10 -07:00
Adam Lesinski
e7ad74f070 Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev 2014-09-09 23:15:08 +00:00
wsmlby
dd806b0ed3 Fix AppCompatibility test for different process name of one package. 
Change-Id: Ic30e5ee81fe6ea82e88d2c5541dc9fa9eba71043
 2014-09-09 16:10:12 -07:00
Adam Lesinski
3fb8c9b50e AAPT: Don't crash on illegal symbol name 
We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.

External bug: https://code.google.com/p/android/issues/detail?id=75876

Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
 2014-09-09 16:05:10 -07:00
Alan Viverette
463f4c10b4 am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 
* commit 'b7afde5c05fa7bc37aa8cdd58b55b298dbeca004':
  Bring up the IME when TextView receives ACTION_CLICK
 2014-09-09 23:04:50 +00:00
Adam Powell
dc46298214 am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 
* commit '8197da7703d0753d29b3ab5fda8771ef9d165d40':
  ActionMenuViews always reserve overflow when creating their own menus
 2014-09-09 23:04:45 +00:00
Alan Viverette
a7cbaeb138 Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 2014-09-09 22:58:28 +00:00
Adam Powell
ad0c450d4d Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 2014-09-09 22:56:20 +00:00
Christopher Tate
82ecd480f4 am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '3b9417ff52248190fa324eef87bec8ab050e42f4':
  Fix BackupManager.isBackupEnabled()
 2014-09-09 22:54:43 +00:00
Winson Chung
2ba16715b5 am b68c78bd: Announcing the task list as you scroll. (Bug 15699050) 
* commit 'b68c78bdec4f680e4b5536a7f8df90513cc5aba7':
  Announcing the task list as you scroll. (Bug 15699050)
 2014-09-09 22:54:39 +00:00