Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,000 Commits 3 Branches 0 Tags
1d8d111a16bc696217162ddbd4cf08ca2bc5eb21
Commit Graph

48758 Commits

Author SHA1 Message Date
Andrew Flynn
4fda24fece am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'c570a6290f6051346bbbfb0e9e8fbe8d7ede8d99':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-10 15:01:32 +00:00
Andrei Stingaceanu
52243ad30d am 15f4dd72: resolved conflicts for merge of 1c96a941 to mnc-ub-dev 
* commit '15f4dd72192f11982a41d2fd92b7c2302b521476':
  Completely remove ExtractActionMode from ExtractEditLayout
 2015-06-10 15:01:27 +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
Martijn Coenen
0c2d3d93dd am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit 'b1c579df0be37a43101f2a2c8205b2fe648c1377':
  Make peer LLCP version an int.
 2015-06-10 07:20:39 +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
d6c886f862 am f355a22d: am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'f355a22d1421a640bf057047b7833000acf94519':
  Flags to select storage volume for app installs.
 2015-06-10 05:07:51 +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
4af0945647 am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit '72df690ce07c20ef45c7a8a60b90e0ef70a1263b':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 03:48:36 +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
54dd1e4c73 am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit '60022334b7bff4a8c985465186e7472215178819':
  Use who when requesting permissions
 2015-06-10 01:54:27 +00:00
Dianne Hackborn
3fca7b7929 am 4f8fdd93: am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '4f8fdd93329e5f78a21e6eeee75f99a6c9399743':
  Fix NPE.
 2015-06-10 01:29:22 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +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
Christopher Ferris
8d6417f550 am 0a778262: am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '0a7782625717252c00f39aa0748ece34adf467ce':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:54:00 +00:00
Dianne Hackborn
c0cdfa5947 Fix NPE. 
Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
 2015-06-09 17:53:47 -07: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
45c75dea7f am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '549aacfe9a299a61b5bc5acc2b776ac545cd855b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:00: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
a70c0d7aa1 am d43ee126: am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit 'd43ee1260e5cd9fb7cd56d38557b494bc475612f':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:27:44 +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
dfe46032e7 am 2fb726fe: am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit '2fb726fe203dd7b0e554ebc3f03593593793c3b6':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 22:55:14 +00:00
Chris Craik
6460673596 am 57998147: am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '5799814745c2e98bf6a721b01dff019d022d4a78':
  Dont ignore layer paint alpha in software path
 2015-06-09 22:55:06 +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
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
Xiyuan Xia
c7a1d5d6e2 am 000d5339: am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit '000d53395983774c0feb5da3f73719d9956678d7':
  Add setting for assistant
 2015-06-09 22:25:47 +00:00
Chris Craik
751afe2040 Merge "Dont ignore layer paint alpha in software path" into mnc-dev 2015-06-09 22:23:36 +00:00
Casper Bonde
63ddfba1ea am 27850204: am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '278502040d77f1dfa4fe7f9f724095ba49fba218':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 22:05:09 +00:00
Xiyuan Xia
12149b699e Merge "Add setting for assistant" into mnc-dev 2015-06-09 22:00:32 +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
Dianne Hackborn
51bcd6728b am 1a18d087: am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit '1a18d087d7c31ee037c9583949f5ecc34ae96479':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:26:09 +00:00
Paul Miller
d8d9a0b20f am 057491d6: am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit '057491d65dfceafad9bae3ddad2c0faafdc4236f':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:26:03 +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
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
Yohei Yukawa
be9ed058c6 am 3f501b9b: am 62974816: Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 
* commit '3f501b9b0ece289f1ee5b35b96efc9109255d7e6':
  Do not accept an empty string in EditorInfo#packageName anymore.
 2015-06-09 20:55:05 +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
62974816a3 Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 2015-06-09 20:30:56 +00:00
Andrew Flynn
ceaed68b07 notifyCarrierNetworkChange:TelephonyManager->CarrierService 
Re-checkin of 7f8be9d89b.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
  does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
 2015-06-09 16:28:54 -04:00
Yohei Yukawa
b274f3f45c am cce769a0: am eae09d1a: Merge "Update JavaDoc of EditorInfo#packageName." into mnc-dev 
* commit 'cce769a0fbc9bfa01b5f339108fd25beb0c0813f':
  Update JavaDoc of EditorInfo#packageName.
 2015-06-09 19:49:09 +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
68385af87f am 57327e20: am 78528b22: Fixed a RTL layouting bug with LinearLayout 
* commit '57327e20b81af85386dacbb4ee83f1ffad61c68b':
  Fixed a RTL layouting bug with LinearLayout
 2015-06-09 18:43:42 +00:00
Andreas Gampe
e95f4bf113 am 3f2fbf7e: am 2c936af8: Merge "Frameworks/base: Add is64Bit method to Process" into mnc-dev 
* commit '3f2fbf7e1fa8338cc7d700c951a750f353bdff84':
  Frameworks/base: Add is64Bit method to Process
 2015-06-09 18:43:32 +00:00