Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,213 Commits 3 Branches 0 Tags
a4f8893e432b745091bd74c4591605dadd4bc45e
Commit Graph

48662 Commits

Author SHA1 Message Date
Keisuke Kuroyanagi
a4f8893e43 am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit '136a462c8bb35bdd21258f03f3f9adca06990701':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-11 14:50:13 +00:00
Chet Haase
7bd942469d am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev 
* commit '81728b862e8448bc460fd6589de6c1b954f8227e':
  Clarify docs for Animator.isStarted()
 2015-06-11 14:49:49 +00:00
Andrew Flynn
64af0511ca am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'da9bbf725592c6482d6fbce18ef8c258b18e4fc8':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-11 14:48:29 +00:00
Andrei Stingaceanu
a6a63328b0 resolved conflicts for merge of 1c96a941 to mnc-vt-dev 
Change-Id: I054ad8a72daa609138954909619ef6270062baaf
 2015-06-11 12:08:49 +01:00
Keisuke Kuroyanagi
136a462c8b Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 2015-06-10 15:13:16 +00:00
Keisuke Kuroyanagi
eac4556e55 Revert "Fix: Crash when modifying text while using drag accelerator." 
This reverts commit 259292ff3d.

This introduced another bug (Bug: 21687602) and this is no longer useful
for the original one (Bug: 21178876).


Change-Id: I59acc161e7d8cba633718a3d17292e68740ef79e
 2015-06-10 15:02:22 +00:00
Chet Haase
81728b862e Merge "Clarify docs for Animator.isStarted()" into mnc-dev 2015-06-10 14:27:47 +00:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Chet Haase
4ddd9257d6 Clarify docs for Animator.isStarted() 
Behavior is different than spec'd for one-shot animators, clarified
docs to reflect that.

Issue #21087798 better docs for isStarted()

Change-Id: I499a5d52cf02ef715acb6ae0635ede4328c93de8
 2015-06-10 10:42:50 +01:00
Martijn Coenen
5b7041ae4a am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '706f23ddb9f18663d5ae70626e118e815a308c84':
  Make peer LLCP version an int.
 2015-06-10 07:09:08 +00:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00
Jeff Sharkey
0f6c72945b am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'e687929f33f272fff9585bd0752d85ad519bc66d':
  Flags to select storage volume for app installs.
 2015-06-10 04:56:57 +00:00
Jeff Sharkey
e687929f33 Merge "Flags to select storage volume for app installs." into mnc-dev 2015-06-10 04:43:18 +00:00
Jeff Sharkey
ab2340996a Flags to select storage volume for app installs. 
Remote callers can now provide the "--install-location" value from
the APK to help select a location, or they can explicitly force a
volume by UUID.

Bug: 21676789
Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
 2015-06-09 21:42:22 -07:00
Yao Chen
73e648b2a6 am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit 'a0d41262d48eb48285bb3a0e71bfc5b7b89be601':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:37:17 +00:00
Yao Chen
a0d41262d4 Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 2015-06-10 03:28:29 +00:00
Svetoslav
e22b616440 am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit 'a1e60f1f45dce19f9dc15b97cbb0821ffeb54d9d':
  Use who when requesting permissions
 2015-06-10 01:42:58 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Dianne Hackborn
acf286b759 am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '113769d70b2221697ad9a9553da68ec6483cbfa1':
  Fix NPE.
 2015-06-10 01:19:06 +00:00
Svetoslav
970b59cbe3 Use who when requesting permissions 
Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
 2015-06-09 18:17:44 -07:00
Dianne Hackborn
113769d70b Merge "Fix NPE." into mnc-dev 2015-06-10 01:06:29 +00:00
Dianne Hackborn
c0cdfa5947 Fix NPE. 
Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
 2015-06-09 17:53:47 -07:00
Christopher Ferris
4fd567ba1d am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '1a4b8288ad525ec9e951010151e4ed91bd514043':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:38:58 +00:00
Christopher Ferris
1a4b8288ad Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 2015-06-10 00:25:32 +00:00
Dianne Hackborn
1a21134c02 am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '476695227393b6c35c6777754b0e3b6448ceb7d2':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-09 23:47:11 +00:00
Dianne Hackborn
4766952273 Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 2015-06-09 23:33:52 +00:00
Wale Ogunwale
fd65becff1 am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit '2c4643dd802d18ca0088fa860076fe917c69335f':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:13:38 +00:00
Wale Ogunwale
2c4643dd80 Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 2015-06-09 23:01:05 +00:00
Yao Chen
597ad3fb51 Copy lockTaskLaunchMode from target activity to its alias. 
Bug: 21675800
Change-Id: I518f71d57b0a113797fb3879b776cc7142351218
 2015-06-09 16:00:14 -07:00
Jim Miller
180595d843 am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit '31ed2044e2907954b32148c06b131d3069b1c8ca':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 22:40:43 +00:00
Wale Ogunwale
cac3dc636d Fixed issue with using wrong display id when creating context for displays 
Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
 2015-06-09 15:35:02 -07:00
Chris Craik
a532dae57d am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '751afe2040a1954826f550c0fdc2c1f148fe21eb':
  Dont ignore layer paint alpha in software path
 2015-06-09 22:29:25 +00:00
Jim Miller
31ed2044e2 Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 2015-06-09 22:27:40 +00:00
Jim Miller
e4c58e4641 Add documentation for possible AndroidKeyStore exceptions to authenticate() call 
Fixes bug 20864436

Change-Id: Ic3f7406a8a6f41283ccd63018787a20353510024
 2015-06-09 15:26:43 -07:00
Chris Craik
751afe2040 Merge "Dont ignore layer paint alpha in software path" into mnc-dev 2015-06-09 22:23:36 +00:00
Xiyuan Xia
e202479112 am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit '12149b699e21a6c11285391c1fcef25a07fcf066':
  Add setting for assistant
 2015-06-09 22:13:28 +00:00
Xiyuan Xia
12149b699e Merge "Add setting for assistant" into mnc-dev 2015-06-09 22:00:32 +00:00
Casper Bonde
29c6d01867 am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '3b3d1fea94318a4892fbd4353269749af417a81a':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 21:52:56 +00:00
Casper Bonde
3b3d1fea94 SAP: Make it possible to enforce a 16-digit pin code (4/5) 
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I3205013f9e758c353381442a86845dab467780f8
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-09 21:42:22 +00:00
Xiyuan Xia
e6de8b9ad4 Add setting for assistant 
- Add assistant setting in Settings.Secure;
- If the assistant setting is missing, start assistant as current behavior;
- If the setting is present, start assistant use the setting value;

Bug:20210110
Change-Id: I946fbb504452e445879ad688130a1570b857b9c5
 2015-06-09 14:21:38 -07:00
Dianne Hackborn
a3acdb33df Fix issue #21621920: VI: need mechanism to get current request 
Add new APIs to associate a Request with a name, get all active
requests, and get active request by name.

Also add a new Activity.onProvideReferrer() which will allow
applications to propagate referrer information to the assistant
(and other apps they launch) in a consistent way.

Change-Id: I4ef74b5ed07447da9303a74a1bdf42e4966df363
 2015-06-09 14:15:49 -07:00
Dianne Hackborn
4d04e95727 am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit 'ea7438e4a698945b3e3a7786cff726c337291a68':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:13:32 +00:00
Paul Miller
f6cd3f0f1d am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit '87a19e25fe736a0fe92a0b4e8490136350519393':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:13:26 +00:00
Dianne Hackborn
ea7438e4a6 Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 2015-06-09 21:08:17 +00:00
Paul Miller
87a19e25fe Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 2015-06-09 21:00:32 +00:00
Chris Craik
f396f011ee Dont ignore layer paint alpha in software path 
bug:19412691

Change-Id: Ie56b2cbc667a078eb4a7c5bfe7b8e8dd6b0fc24b
 2015-06-09 13:50:01 -07:00
Yohei Yukawa
8206024e4e am 62974816: Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 
* commit '62974816a325fa6ea49d6f9800b962af85a9856a':
  Do not accept an empty string in EditorInfo#packageName anymore.
 2015-06-09 20:40:52 +00:00
Yohei Yukawa
62974816a3 Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 2015-06-09 20:30:56 +00:00