Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,129 Commits 3 Branches 0 Tags
fa16ba6727b2a084d4d465af289b04da41c98c06
Commit Graph

41353 Commits

Author SHA1 Message Date
Kenny Guy
fa16ba6727 am 39a0254d: am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit '39a0254dbfdd170f85602db395a5144f9dd77870':
  Remember userId when stripping / rebuilding notification.
 2014-09-11 14:12:46 +00:00
Christoph Studer
cbbfdd93ce am 7e972136: am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '7e97213689ca26aad243f5a5009c39f616298619':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-11 14:12:41 +00:00
Christoph Studer
2c17ed07ec am 10afc04f: am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '10afc04f80b3ae27f5d56f4f7a10ffd36366b432':
  Notification: Use ViewStub for ProgressBar
 2014-09-11 14:12:36 +00:00
Adam Connors
de2f85e871 am 94705219: am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '94705219a13a9d8909c4502eac493d3ef9459403':
  Add feature flags for verified boot and securely remove users.
 2014-09-11 14:12:28 +00:00
Kenny Guy
1985b7e138 am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'a6e2ae352bf74ec29ae60d3f21e900d73e7da14e':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:32:20 +00:00
Christoph Studer
64fcd76970 am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '72d1509d598e53858db4f7d16d64761e32035990':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:32:15 +00:00
Christoph Studer
b14eb90414 am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '27674421aef9e3e3dd521a042b3fa939f9c92517':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:32:09 +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
9e33450f5f am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '50c161df87f5af9862ed90af47c1252b7336f828':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:26:20 +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
a98f7d715d am 8faef75e: am d72d7869: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit '8faef75e308e80bc7ecbc4266cdd8c7baaba7171':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:41:40 +00:00
Jessica Hummel
285890c52d am fa2d0222: am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit 'fa2d0222de3f4c627e52647793a037cdd8bd110a':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:41:21 +00:00
Yohei Yukawa
6f6734c6cb am d72d7869: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit 'd72d7869702f36911429da0ee8390e089a6f0a79':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:31:46 +00:00
Jessica Hummel
e0c2e0dbb4 am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '9a21c2a39afb36d1105680139acddb9adf4a9791':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:31:40 +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
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
Adam Lesinski
0a2cfc6296 am 2feb9c9a: am 2413aa58: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '2feb9c9a5153136d6d0f4d32859113fc1ebe6a4f':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 01:10:00 +00:00
Alan Viverette
a6bf7e0bbf am 2b731571: am 0ca92d44: am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 
* commit '2b731571b3a3b2265183d4b303594e0052a422e0':
  Bring up the IME when TextView receives ACTION_CLICK
 2014-09-10 01:09:37 +00:00
Adam Powell
b28776d5d5 am e9186d05: am 129aeb16: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 
* commit 'e9186d0552f7d38e11be2b809c30e767bf259c8b':
  ActionMenuViews always reserve overflow when creating their own menus
 2014-09-10 01:09:29 +00:00
Christopher Tate
6e78c704e7 am 2e44285f: am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '2e44285f8a7a235cb2ac44514bc702f9e3fd76eb':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 01:09:22 +00:00
Jeff Sharkey
823e56b79f am f7061676: am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit 'f706167630a44d372fdddb0321c0ecb0ed5d1bb3':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-10 01:08:32 +00:00
Yin-Chia Yeh
bd4e8987ce am 74405587: am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '7440558739b20b835923e53866cd1998e6a77a37':
  camera2: make 3A regions null when not available
 2014-09-10 01:08:25 +00:00
Eino-Ville Talvala
b0fbabb77b am 75b0c316: am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '75b0c316390daeddbfcc897bcd4a763fed557fef':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 01:08:16 +00:00
Adam Lesinski
ceb63ed177 am 2413aa58: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev 
* commit '2413aa5838c0d9e653c419c4566ab76a5c7bde2d':
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
 2014-09-10 00:51:43 +00:00
Alan Viverette
8c2b2085c9 am 0ca92d44: am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 
* commit '0ca92d44894f7af06f595368281034d762693c61':
  Bring up the IME when TextView receives ACTION_CLICK
 2014-09-10 00:50:53 +00:00
Adam Powell
361ca8c1e9 am 129aeb16: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 
* commit '129aeb1644b8faf9600d74e18b2ab799a121830f':
  ActionMenuViews always reserve overflow when creating their own menus
 2014-09-10 00:50:48 +00:00
Christopher Tate
239e587ab9 am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '1ca58e08f44ae97ed238bdbb820eea12d62f6ce3':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 00:50:41 +00:00
Jeff Sharkey
2dadfeb306 am 47bf9080: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit '47bf90808bd42a3fcfd5434ec216a8ba8859f8f0':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-10 00:50:06 +00:00
Yin-Chia Yeh
0efe661696 am 5fc81692: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '5fc81692af2d249b901a0f7ce4ec6bc5327ff8c2':
  camera2: make 3A regions null when not available
 2014-09-10 00:49:37 +00:00
Eino-Ville Talvala
2f94ed6cee am f9e64824: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit 'f9e648243298760e96053a90674b30fe00ce3f5c':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 00:49:31 +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
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
363c408af5 Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 2014-09-09 22:51:27 +00:00
Jeff Sharkey
ad5f44a68c Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 2014-09-09 22:44:52 +00:00
Christopher Tate
9e079298ed Fix BackupManager.isBackupEnabled() 
It wasn't properly lazy-initializing the service binder, so it always
thought the backend service didn't exist, and so always returned false.

Also directly validated that every usage of sService in the module is
now correctly lazy-initialized.

Bug 16661321

Change-Id: If5fbb18aef81bfa8fd70eb40a1f6af54cc96d804
 2014-09-09 22:36:14 +00:00
Yin-Chia Yeh
8544c7da86 Merge "camera2: make 3A regions null when not available" into lmp-dev 2014-09-09 22:24:49 +00:00
Eino-Ville Talvala
31913c334a Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 2014-09-09 22:20:58 +00:00
Amith Yamasani
95674712b0 am af81aa33: am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit 'af81aa331fce43f80b018a38a0f042b73e38c349':
  User restriction to disallow outgoing NFC beam
 2014-09-09 22:07:55 +00:00
Riley Andrews
c890b81a7b am 3dec5a67: am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit '3dec5a67d900e18f3aa3607aeb20fa4e6586f771':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 22:07:36 +00:00
Alan Viverette
0faf7dc76f am 0c6884d2: am aafd303e: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit '0c6884d266b7c3d08bd68d018be8053da7ecd22b':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 22:07:31 +00:00
Jeff Sharkey
bc09755e19 Missing manifest error should be NO_CERTIFICATES. 
When META-INF/MANIFEST.MF is missing, treat as NO_CERTIFICATES
instead of CERTIFICATE_ENCODING.  Also remove redundant layer of
debugging details when wrapping exceptions.

Bug: 15667982
Change-Id: I6e8216d5bf6e42da1feb70c89f991001380305be
 2014-09-09 14:57:26 -07:00
Amith Yamasani
1f4ea68a07 am d94df395: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit 'd94df395a87836b5dba6bd159010046e1d016661':
  User restriction to disallow outgoing NFC beam
 2014-09-09 21:56:09 +00:00
Riley Andrews
4ef0f50c29 am f41b1485: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit 'f41b14855e6fd1bcf2ddaa843d0e177825010023':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 21:55:38 +00:00
Alan Viverette
d381834c77 am aafd303e: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit 'aafd303e48e95fda8b2b5bd9e3541e87997d6ef4':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 21:55:33 +00:00
Adam Powell
e8d153673b ActionMenuViews always reserve overflow when creating their own menus 
ActionMenuViews work in two modes: hosting another Menu instance or
creating their own. The former is used when an action bar is
displaying a window's options menu. The latter is used when an
ActionMenuView (or Toolbar) is placed within an arbitrary layout and
the getMenu method is called.

When showing a window's options menu, ActionMenuPresenter calls into
the ActionBarPolicy to determine if we should reserve an overflow
button or if overflow will be presented by the window instead. Always
reserve overflow if the ActionMenuView is presenting its own menu.

Bug 17381966

Change-Id: I17c495986994d421bf6276ae39ba233243432e97
 2014-09-09 13:51:16 -07:00