Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,842 Commits 3 Branches 0 Tags
3c8a0debbfea1e799bcc859636315270d366288d
Commit Graph

53696 Commits

Author SHA1 Message Date
Chris Banes
569c6d3eb0 am 1f5714c6: am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit '1f5714c610571671a36425ecb4a485c3183e6942':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 10:11:06 +00:00
Chris Banes
1f5714c610 am d64c5bef: am d9b0acd2: Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 
* commit 'd64c5befd61434168b16f6eb1b722b7d3512f15a':
  Fix location for ActionMenuItemView cheat sheet
 2015-06-10 09:57:52 +00:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
Martijn Coenen
ab428b87f2 am 0c2d3d93: am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev 
* commit '0c2d3d93dd2f8f0e355299188a8a77b5287b150f':
  Make peer LLCP version an int.
 2015-06-10 07:34:42 +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
0d7e33ec47 am d6c886f8: am f355a22d: am e687929f: Merge "Flags to select storage volume for app installs." into mnc-dev 
* commit 'd6c886f8621dc259a5bc9d64c74e983c6dc35a85':
  Flags to select storage volume for app installs.
 2015-06-10 05:21:21 +00: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
ae9905654b am 4af09456: am 72df690c: am a0d41262: Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 
* commit '4af0945647573b7aacbd014effc9bb0353608447':
  Copy lockTaskLaunchMode from target activity to its alias.
 2015-06-10 04:02:04 +00: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
ba338ecc2a am 54dd1e4c: am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev 
* commit '54dd1e4c7320e5e9466194ebb3e8cbf45ddfd336':
  Use who when requesting permissions
 2015-06-10 02:05:55 +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
71bf7a381c am 3fca7b79: am 4f8fdd93: am 113769d7: Merge "Fix NPE." into mnc-dev 
* commit '3fca7b7929870be9762bc4dd5782fad64d108a34':
  Fix NPE.
 2015-06-10 01:35:01 +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
Christopher Ferris
a544e16c48 am 8d6417f5: am 0a778262: am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '8d6417f5509dbf7268156af9d42dc3c0f93a8fa0':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 01:10:10 +00: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
098e4bf040 am 45c75dea: am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '45c75dea7f1c03e4e899e5316785731b91daf85b':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-10 00:14:03 +00:00
Zheng Fu
50ef8f5eb6 Merge "un-hide raw_contacts.backup_id and expose metadatasync to system." 2015-06-10 00:06:04 +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
Zheng Fu
7997bee366 un-hide raw_contacts.backup_id and expose metadatasync to system. 
Bug:18930508
Change-Id: I37eb7ca41416becb549ebe5b1986925952a943c9
 2015-06-09 16:50:02 -07:00
Wale Ogunwale
f8a590fad0 am a70c0d7a: am d43ee126: am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit 'a70c0d7aa1841f593cab3e5639db6e0b469ead47':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:40:34 +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
Jim Miller
142bd48866 am dfe46032: am 2fb726fe: am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit 'dfe46032e7f8dfb66f088a09142024b9e1e9c4a2':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 23:23:21 +00:00
Chris Craik
d55dee2018 am 64606735: am 57998147: am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '646067359634a7f2a6e42096b09329127c0dc225':
  Dont ignore layer paint alpha in software path
 2015-06-09 23:23:16 +00:00
Xiyuan Xia
d880c4bc1e am c7a1d5d6: am 000d5339: am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit 'c7a1d5d6e23f1cc0fbe2fb277395792cd6ee1657':
  Add setting for assistant
 2015-06-09 23:22:57 +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
56e46424fd am 63ddfba1: am 27850204: am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '63ddfba1eaad7f8eee8b7e31af5bbd79b542ad32':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 22:19:50 +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
ffa0f10ddd am 51bcd672: am 1a18d087: am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit '51bcd6728b30bcef6f89e710fec25a9a081bb46b':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:42:14 +00:00
Paul Miller
1bb1f05144 am d8d9a0b2: am 057491d6: am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit 'd8d9a0b20ff61bfb4ba544958445236806cf0cf8':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:42:08 +00:00