Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,873 Commits 3 Branches 0 Tags
fb324578aabe1f7acd89adba06596c5affbb6138
Commit Graph

43759 Commits

Author SHA1 Message Date
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
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
7137ee38cb 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-10 00:17:53 +00:00
Alan Viverette
e05fa99b0f 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-10 00:17:35 +00:00
Adam Powell
8a0860c293 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-10 00:17:31 +00:00
Christopher Tate
9bd0122216 am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '3b9417ff52248190fa324eef87bec8ab050e42f4':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 00:17:26 +00:00
Jeff Sharkey
1f43d44a07 am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev 
* commit 'c5d4ebd640a0bca62fb52a42830c8646316ee386':
  Missing manifest error should be NO_CERTIFICATES.
 2014-09-10 00:16:35 +00:00
Yin-Chia Yeh
a03742d854 am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev 
* commit '916d8fafe6b61b7499cc8d41331adfb11d2136fa':
  camera2: make 3A regions null when not available
 2014-09-10 00:16:07 +00:00
Eino-Ville Talvala
2005a1c210 am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev 
* commit '28312293a2dfab504e5d1e6102c5392d652b6981':
  Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
 2014-09-10 00:16:03 +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
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
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
Amith Yamasani
52f57637a2 am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 
* commit '7a9f541e596b4db8824969678896161c8e06d6bc':
  User restriction to disallow outgoing NFC beam
 2014-09-09 20:38:39 +00:00
Alan Viverette
b687788f52 Bring up the IME when TextView receives ACTION_CLICK 
Simulates the relevant portions of a DOWN/UP event pair to request focus
and bring up the IME.

BUG: 8213791
Change-Id: Idb32d81552ecbbdefc64686c914eba6d8e28b0b8
 2014-09-09 13:38:08 -07:00
Amith Yamasani
da6e6c888f Merge "User restriction to disallow outgoing NFC beam" into lmp-dev 2014-09-09 20:29:57 +00:00
Riley Andrews
acc8d604df am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 
* commit '4b7c14bf1cb62c806223b12fdf3c5ba1d48908e7':
  Use surfaceflinger for recents thumbnail rotations.
 2014-09-09 20:04:53 +00:00
Alan Viverette
0a90e489e2 am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 
* commit 'e74dff14dc6e075e372aeedb6610243c28884610':
  Use correct row/column order in list and grid CollectionItems
 2014-09-09 20:04:49 +00:00
Riley Andrews
0b81adcaea Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev 2014-09-09 19:59:15 +00:00
Alan Viverette
b505298489 Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev 2014-09-09 19:57:09 +00:00
Eino-Ville Talvala
e8df3093f5 Camera2: Add frameNumber to CaptureCallback#onCaptureStarted 
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.

Bug: 17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
 2014-09-09 12:38:11 -07:00
Amith Yamasani
26af829fd7 User restriction to disallow outgoing NFC beam 
This can be controlled by MDMs via DPM.

Also fixes:
 - javadoc for restrictions
 - persisting of cross profile copy/paste restriction

Bug: 17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
 2014-09-09 12:09:47 -07:00
Griff Hazen
b6327ea2f0 am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 
* commit 'df35ac5fab51383099a2f8e5206202af58ef79bf':
  Remove reference to StatusBarNotification after the value is accessed.
 2014-09-09 18:54:36 +00:00
Griff Hazen
f8ead28ecb am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'c06b7a78433830308ac62be25b3a13d6415e3699':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:54:22 +00:00
Alexandra Gherghina
f89e794a15 am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 
* commit 'c3b392d02693f8236fdc6ebc90412e3c4aaa5843':
  Removing the NO_CROSS_PROFILE flag for intent forwarding
 2014-09-09 18:53:50 +00:00
Griff Hazen
2f439763bd Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev 2014-09-09 18:35:54 +00:00
Adam Lesinski
eddeb49a73 ActivityManager shouldn't return null for getCurrentUser 
There was a race where ActivityManager would return null
for getCurrentUser() when switching between guest accounts.
This is because the Guest account was marked for deletion
while it was still active.

Bug:17290209

Change-Id: I224fb4b6836380e5acb7dbeb8f3343d74505f88a
 2014-09-09 11:15:17 -07:00
Griff Hazen
fc3922d49b Copy visibility docs from support version to base Notification. 
(Noticed the difference in a javadoc diff between Notification and
NotificationCompat)

Bug: 17424399

Change-Id: I639a46c429ffebf8ca47118b2ea80f40ccdc1286
 2014-09-09 18:03:40 +00:00
Alexandra Gherghina
7677694320 Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev 2014-09-09 17:45:36 +00:00
Craig Mautner
c09a20c4c3 am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '77e1dc741bfce75f3e3f5446674d1545a74eae2b':
  Remove deprecated (and now unused) API method.
 2014-09-09 17:10:35 +00:00
Craig Mautner
345d4f4f14 Merge "Remove deprecated (and now unused) API method." into lmp-dev 2014-09-09 17:05:04 +00:00
Dianne Hackborn
8d7567f406 am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '0ad9e247c3b553baee5b42599536d9b0bfbbba31':
  Add new wallpaper features for insets and offsets.
 2014-09-09 16:45:04 +00:00
Dianne Hackborn
bb8c483461 Merge "Add new wallpaper features for insets and offsets." into lmp-dev 2014-09-09 16:41:44 +00:00
Craig Mautner
0321573fa7 Remove deprecated (and now unused) API method. 
Removes ActivityOptions.makeLaunchTaskBehindAnimation().

Fixes bug 16958544.

Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
 2014-09-09 08:53:56 -07:00
Yin-Chia Yeh
808150f066 camera2: make 3A regions null when not available 
Bug: 17346456
Change-Id: If8e1611614622e7eef6f77e03ef55375650f1c51
 2014-09-09 07:56:18 -07:00
Zoltan Szatmary-Ban
3fa3d84376 am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev 
* commit '1bb79472882f5926606713f8b8ddf2e82128051e':
  Extend IKeyChainService AIDL with CACert retrieval
 2014-09-09 11:08:00 +00:00
Zoltan Szatmary-Ban
1d38f58990 Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev 2014-09-09 11:05:45 +00:00
Alexandra Gherghina
c788487ae5 Removing the NO_CROSS_PROFILE flag for intent forwarding 
Bug: 17435289
Change-Id: Iffbecd3cf9338a8633bfcc5bc47247bfc50e7546
 2014-09-09 12:04:34 +01:00