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

52871 Commits

Author SHA1 Message Date
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
Adam Lesinski
472eb8115a am f17138f0: Merge "Fix calculation of power drain from BT and WiFi" into mnc-dev 
* commit 'f17138f068af9f89d760b4c0f33c0a32a267d849':
  Fix calculation of power drain from BT and WiFi
 2015-06-09 19:55:15 +00:00
Adam Lesinski
f17138f068 Merge "Fix calculation of power drain from BT and WiFi" into mnc-dev 2015-06-09 19:52:11 +00:00
Adam Lesinski
8576cf941d Fix calculation of power drain from BT and WiFi 
Unit issue (mV vs V).

Change-Id: I08843312339ccf35a3b55b1c2385c36fdbf61ead
 2015-06-09 12:48:25 -07:00
Yohei Yukawa
8370f40fe1 am eae09d1a: Merge "Update JavaDoc of EditorInfo#packageName." into mnc-dev 
* commit 'eae09d1ad759f7f28bc7f958cce41f8bd0f22ecd':
  Update JavaDoc of EditorInfo#packageName.
 2015-06-09 19:36:07 +00:00
Yohei Yukawa
eae09d1ad7 Merge "Update JavaDoc of EditorInfo#packageName." into mnc-dev 2015-06-09 19:23:02 +00:00
Paul Miller
c8694a082a Deprecate WebView scrollbar overlay API 
Deprecate setHorizontalScrollbarOverlay, setVerticalScrollbarOverlay,
overlayHorizontalScrollbar, and overlayVerticalScrollbar. They've been
no-ops for years, ever since WebViewChromium.

BUG:21642246
Change-Id: Ia1062c53fdbaa7a0d282ba79da733a6f3b9ac84f
 2015-06-09 11:48:01 -07:00
Selim Cinek
c98afce379 am 78528b22: Fixed a RTL layouting bug with LinearLayout 
* commit '78528b22c29f570469fe3c75328042f83a5a24c3':
  Fixed a RTL layouting bug with LinearLayout
 2015-06-09 18:37:52 +00:00
Selim Cinek
78528b22c2 Fixed a RTL layouting bug with LinearLayout 
When the RTL properties of a horizontal LinearLayout
changed, nobody enforced the view to be layouted anew,
even though its layout is dependent on the layout
direction. This could lead to stale layouts being
temporarily layouted the wrong way.

Bug: 20495301
Change-Id: I979c8d86ee711626b2901b65ebdf007c1eb1c0fa
 2015-06-09 18:33:19 +00:00
Andreas Gampe
7138620c29 am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 
* commit '2c936af815167b3f6bbb21d5dccea78b0bd348af':
  Frameworks/base: Add is64Bit method to Process
 2015-06-09 18:33:18 +00:00
Andreas Gampe
2c936af815 Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 2015-06-09 18:20:00 +00:00
Christopher Ferris
2d073ba83c Change wtf errors from ASSERT to ERROR. 
Calling println_native with the value of ASSERT will set the abort
message. Unfortunately, there are numerous cases where one thread aborts,
but before that thread can communicate with debuggerd, another thread
calls wtf, which overwrites the abort message from the original
failing thread.

Fix this by changing this to an error level log message.

Bug: 21490722
Change-Id: I9500e2e63eea96722602fdd46c86939c001a7c65
 2015-06-09 10:51:43 -07:00
Doris Liu
46cc604686 am a46ccc16: Merge "Infer value type for ObjectAnimator, too" into mnc-dev 
* commit 'a46ccc164dc0a39964e85f8135963cda78ac9677':
  Infer value type for ObjectAnimator, too
 2015-06-09 17:47:17 +00:00
Doris Liu
a46ccc164d Merge "Infer value type for ObjectAnimator, too" into mnc-dev 2015-06-09 17:42:00 +00:00
Clara Bayarri
ef5d99ca65 am 0f925d0d: Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev 
* commit '0f925d0def01d586108c6ef0683efd8d9bbe1737':
  Fallback to old Window.Callback#onWindowStartingActionMode
 2015-06-09 17:27:28 +00:00
Clara Bayarri
0f925d0def Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev 2015-06-09 17:18:50 +00:00
Richard Uhler
e28ce32fdc am 659716d7: Merge "Add Debug.MemoryInfo.getMemoryStats API." into mnc-dev 
* commit '659716d7a03553006e67b01008c2e9e03a20ed31':
  Add Debug.MemoryInfo.getMemoryStats API.
 2015-06-09 16:59:21 +00:00